[latex3-commits] [latex3/hyperref] newlabel: clean up test files (3d2a73c)
github at latex-project.org
github at latex-project.org
Mon May 15 12:02:34 CEST 2023
Repository : https://github.com/latex3/hyperref
On branch : newlabel
Link : https://github.com/latex3/hyperref/commit/3d2a73c1014cf856643de4cd434194d7989d8890
>---------------------------------------------------------------
commit 3d2a73c1014cf856643de4cd434194d7989d8890
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon May 15 12:02:34 2023 +0200
clean up test files
>---------------------------------------------------------------
3d2a73c1014cf856643de4cd434194d7989d8890
testfiles/xr-newlabel-1.lvt | 17 ++++++----
testfiles/xr-newlabel-1.tlg | 53 ++++++++++++++++++-----------
testfiles/xr-newlabel-2.lvt | 18 ++++++----
testfiles/xr-newlabel-2.tlg | 31 +++++++++--------
testfiles/xr-newlabel-3.lvt | 23 +++++++++----
testfiles/xr-newlabel-3.tlg | 39 +++++++++++-----------
testfiles/xr-newlabel-4.lvt | 45 +++++++++++++++++++++++++
testfiles/xr-newlabel-4.tlg | 81 +++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 231 insertions(+), 76 deletions(-)
diff --git a/testfiles/xr-newlabel-1.lvt b/testfiles/xr-newlabel-1.lvt
index a66c46f..1ac9ddb 100644
--- a/testfiles/xr-newlabel-1.lvt
+++ b/testfiles/xr-newlabel-1.lvt
@@ -1,16 +1,16 @@
\documentclass{book}
\input{regression-test}
\begin{filecontents}[force]{test-aux1.aux}
-% aux-file with five arguments
+%aux-file with five arguments
\newlabel{Ia}{{1.1}{1}{}{}{}}
\newlabel{Ib}{{1.2}{1}{}{}{}}
-\newlabel{Icfail}{{1.3}{1}}%to check if test stopped
+\newlabel{Icspecial}{{1.3}{1}}
\end{filecontents}
\begin{filecontents}[force]{test-aux2.aux}
-% aux-file with two arguments
+%aux-file with two arguments
\newlabel{IIa}{{1.1}{1}}
\newlabel{IIb}{{1.2}{1}}
-\newlabel{IIbfail}{{1.2}{1}{}{}{}}%to check if test stopped
+\newlabel{IIbspecial}{{1.2}{1}{}{}{}}%
\newlabel{IIc}{{1.3}{1}}
\end{filecontents}
@@ -26,8 +26,13 @@
\begin{document}
\START \showoutput
-\makeatletter \show\r at Ia \show\r at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
-\show\r at IIbfail \show\r at IIc \show\r at IIIa
+\makeatletter
+ \show\r at Ia \show\r at Ib \show\r at Icspecial
+ \show\r at IIa \show\r at IIb \show\r at IIbspecial \show\r at IIc
+
+ \show\r at IIIa
+
+%This prints the fourth and fifth argument in older LaTeX but works in newer
\ref{IIIa}
\end{document}
diff --git a/testfiles/xr-newlabel-1.tlg b/testfiles/xr-newlabel-1.tlg
index 1b61d61..3b7d6d3 100644
--- a/testfiles/xr-newlabel-1.tlg
+++ b/testfiles/xr-newlabel-1.tlg
@@ -2,34 +2,33 @@ This is a generated file for the l3build validation system.
Don't change this file in any respect.
> \r at Ia=macro:
->{1.1}{1}{}{}{}.
-l. ...\makeatletter \show\r at Ia
- \show\r at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
+l. ... \show\r at Ia
+ \show\r at Ib \show\r at Icspecial
> \r at Ib=macro:
->{1.2}{1}{}{}{}.
-l. ...\makeatletter \show\r at Ia \show\r at Ib
- \show\r at Icfail \show\r at IIa \show\r at IIb
-> \r at Icfail=macro:
-->{1.3}{1}.
-l. ......etter \show\r at Ia \show\r at Ib \show\r at Icfail
- \show\r at IIa \show\r at IIb
+l. ... \show\r at Ia \show\r at Ib
+ \show\r at Icspecial
+> \r at Icspecial=macro:
+->{1.3}{1}{}{}{}.
+l. ... \show\r at Ia \show\r at Ib \show\r at Icspecial
> \r at IIa=macro:
->{1.1}{1}{}{}{}.
-l. ......r at Ia \show\r at Ib \show\r at Icfail \show\r at IIa
- \show\r at IIb
+l. ... \show\r at IIa
+ \show\r at IIb \show\r at IIbspecial \show\r at IIc
> \r at IIb=macro:
->{1.2}{1}{}{}{}.
-l. ...... at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
-> \r at IIbfail=macro:
-->{1.2}{1}{}{}{}{}{}{}.
-l. ...\show\r at IIbfail
- \show\r at IIc \show\r at IIIa
+l. ... \show\r at IIa \show\r at IIb
+ \show\r at IIbspecial \show\r at IIc
+> \r at IIbspecial=macro:
+->{1.2}{1}{}{}{}.
+l. ... \show\r at IIa \show\r at IIb \show\r at IIbspecial
+ \show\r at IIc
> \r at IIc=macro:
->{1.3}{1}{}{}{}.
-l. ...\show\r at IIbfail \show\r at IIc
- \show\r at IIIa
+l. ......\show\r at IIb \show\r at IIbspecial \show\r at IIc
> \r at IIIa=macro:
-->{1.1}{1}{title}{section.title}{}.
-l. ...\show\r at IIbfail \show\r at IIc \show\r at IIIa
+->{1.1}{1}{title}{section.title}{test-aux3.dvi}.
+l. ... \show\r at IIIa
Completed box being shipped out [1]
\vbox(627.36243+0.0)x380.0
.\glue 22.0
@@ -45,7 +44,7 @@ Completed box being shipped out [1]
..\vbox(550.0+0.0)x345.0, glue set 540.0fil
...\write-{}
...\glue(\topskip) 3.05556
-...\hbox(6.94444+0.0)x345.0, glue set 248.83316fil
+...\hbox(6.94444+0.0)x345.0, glue set 192.1108fil
....\hbox(0.0+0.0)x15.0
....\OT1/cmr/m/n/10 1
....\OT1/cmr/m/n/10 .
@@ -68,6 +67,20 @@ Completed box being shipped out [1]
....\OT1/cmr/m/n/10 t
....\OT1/cmr/m/n/10 l
....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 e
+....\OT1/cmr/m/n/10 s
+....\OT1/cmr/m/n/10 t
+....\OT1/cmr/m/n/10 -
+....\discretionary
+....\OT1/cmr/m/n/10 a
+....\OT1/cmr/m/n/10 u
+....\OT1/cmr/m/n/10 x
+....\OT1/cmr/m/n/10 3
+....\OT1/cmr/m/n/10 .
+....\OT1/cmr/m/n/10 d
+....\OT1/cmr/m/n/10 v
+....\OT1/cmr/m/n/10 i
....\hbox(0.0+0.0)x0.0
....\penalty 10000
....\glue(\parfillskip) 0.0 plus 1.0fil
diff --git a/testfiles/xr-newlabel-2.lvt b/testfiles/xr-newlabel-2.lvt
index 49cb73e..f379e0d 100644
--- a/testfiles/xr-newlabel-2.lvt
+++ b/testfiles/xr-newlabel-2.lvt
@@ -1,17 +1,16 @@
\documentclass{book}
\input{regression-test}
-
\begin{filecontents}[force]{test-aux1.aux}
-% aux-file with five arguments
+%aux-file with five arguments
\newlabel{Ia}{{1.1}{1}{}{}{}}
\newlabel{Ib}{{1.2}{1}{}{}{}}
-\newlabel{Icfail}{{1.3}{1}}%to check if test stopped
+\newlabel{Icspecial}{{1.3}{1}}
\end{filecontents}
\begin{filecontents}[force]{test-aux2.aux}
-% aux-file with two arguments
+%aux-file with two arguments
\newlabel{IIa}{{1.1}{1}}
\newlabel{IIb}{{1.2}{1}}
-\newlabel{IIbfail}{{1.2}{1}{}{}{}}%to check if test stopped
+\newlabel{IIbspecial}{{1.2}{1}{}{}{}}%
\newlabel{IIc}{{1.3}{1}}
\end{filecontents}
@@ -27,8 +26,13 @@
\begin{document}
\START \showoutput
-\makeatletter \show\r at Ia \show\r at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
-\show\r at IIbfail \show\r at IIc \show\r at IIIa
+\makeatletter
+ \show\r at Ia \show\r at Ib \show\r at Icspecial
+
+ \show\r at IIa \show\r at IIb \show\r at IIbspecial \show\r at IIc
+
+ \show\r at IIIa
+% should work fine because of hyperref
\ref{IIIa}
\end{document}
diff --git a/testfiles/xr-newlabel-2.tlg b/testfiles/xr-newlabel-2.tlg
index b368a67..edf2d2e 100644
--- a/testfiles/xr-newlabel-2.tlg
+++ b/testfiles/xr-newlabel-2.tlg
@@ -2,34 +2,33 @@ This is a generated file for the l3build validation system.
Don't change this file in any respect.
> \r at Ia=macro:
->{1.1}{1}{}{}{}.
-l. ...\makeatletter \show\r at Ia
- \show\r at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
+l. ... \show\r at Ia
+ \show\r at Ib \show\r at Icspecial
> \r at Ib=macro:
->{1.2}{1}{}{}{}.
-l. ...\makeatletter \show\r at Ia \show\r at Ib
- \show\r at Icfail \show\r at IIa \show\r at IIb
-> \r at Icfail=macro:
+l. ... \show\r at Ia \show\r at Ib
+ \show\r at Icspecial
+> \r at Icspecial=macro:
->{1.3}{1}{}{}{}.
-l. ......etter \show\r at Ia \show\r at Ib \show\r at Icfail
- \show\r at IIa \show\r at IIb
+l. ... \show\r at Ia \show\r at Ib \show\r at Icspecial
> \r at IIa=macro:
->{1.1}{1}{}{}{}.
-l. ......r at Ia \show\r at Ib \show\r at Icfail \show\r at IIa
- \show\r at IIb
+l. ... \show\r at IIa
+ \show\r at IIb \show\r at IIbspecial \show\r at IIc
> \r at IIb=macro:
->{1.2}{1}{}{}{}.
-l. ...... at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
-> \r at IIbfail=macro:
+l. ... \show\r at IIa \show\r at IIb
+ \show\r at IIbspecial \show\r at IIc
+> \r at IIbspecial=macro:
->{1.2}{1}{}{}{}.
-l. ...\show\r at IIbfail
- \show\r at IIc \show\r at IIIa
+l. ... \show\r at IIa \show\r at IIb \show\r at IIbspecial
+ \show\r at IIc
> \r at IIc=macro:
->{1.3}{1}{}{}{}.
-l. ...\show\r at IIbfail \show\r at IIc
- \show\r at IIIa
+l. ......\show\r at IIb \show\r at IIbspecial \show\r at IIc
> \r at IIIa=macro:
->{1.1}{1}{title}{section.title}{test-aux3.pdf}.
-l. ...\show\r at IIbfail \show\r at IIc \show\r at IIIa
+l. ... \show\r at IIIa
Completed box being shipped out [1]
\vbox(627.36243+0.0)x380.0
.\hbox(0.0+0.0)x0.0
diff --git a/testfiles/xr-newlabel-3.lvt b/testfiles/xr-newlabel-3.lvt
index 6a36f17..4f3bb1d 100644
--- a/testfiles/xr-newlabel-3.lvt
+++ b/testfiles/xr-newlabel-3.lvt
@@ -1,16 +1,16 @@
\documentclass{book}
\input{regression-test}
\begin{filecontents}[force]{test-aux1.aux}
-% aux-file with five arguments
+%aux-file with five arguments
\newlabel{Ia}{{1.1}{1}{}{}{}}
\newlabel{Ib}{{1.2}{1}{}{}{}}
-\newlabel{Icfail}{{1.3}{1}}%to check if test stopped
+\newlabel{Icspecial}{{1.3}{1}}
\end{filecontents}
\begin{filecontents}[force]{test-aux2.aux}
-% aux-file with two arguments
+%aux-file with two arguments
\newlabel{IIa}{{1.1}{1}}
\newlabel{IIb}{{1.2}{1}}
-\newlabel{IIbfail}{{1.2}{1}{}{}{}}%to check if test stopped
+\newlabel{IIbspecial}{{1.2}{1}{}{}{}}%
\newlabel{IIc}{{1.3}{1}}
\end{filecontents}
@@ -19,16 +19,25 @@
\newlabel{IIIa}{{1.1}{1}{title}{section.title}{}}
\end{filecontents}
\usepackage{xr-hyper}
+
\externaldocument{test-aux1}
\externaldocument{test-aux2}
\externaldocument{test-aux3}
-\usepackage{hyperref}
+\usepackage{hyperref} % hyperref after the files has been loaded.
\begin{document}
\START \showoutput
-\makeatletter \show\r at Ia \show\r at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
-\show\r at IIbfail \show\r at IIc \show\r at IIIa
+\makeatletter
+ \show\r at Ia \show\r at Ib \show\r at Icspecial
+
+ \show\r at IIa \show\r at IIb \show\r at IIbspecial \show\r at IIc
+
+ \show\r at IIIa
+% should work fine because of hyperref
\ref{IIIa}
\end{document}
+
+
+
diff --git a/testfiles/xr-newlabel-3.tlg b/testfiles/xr-newlabel-3.tlg
index 9080120..72ea244 100644
--- a/testfiles/xr-newlabel-3.tlg
+++ b/testfiles/xr-newlabel-3.tlg
@@ -2,34 +2,33 @@ This is a generated file for the l3build validation system.
Don't change this file in any respect.
> \r at Ia=macro:
->{1.1}{1}{}{}{}.
-l. ...\makeatletter \show\r at Ia
- \show\r at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
+l. ... \show\r at Ia
+ \show\r at Ib \show\r at Icspecial
> \r at Ib=macro:
->{1.2}{1}{}{}{}.
-l. ...\makeatletter \show\r at Ia \show\r at Ib
- \show\r at Icfail \show\r at IIa \show\r at IIb
-> \r at Icfail=macro:
-->{1.3}{1}.
-l. ......etter \show\r at Ia \show\r at Ib \show\r at Icfail
- \show\r at IIa \show\r at IIb
+l. ... \show\r at Ia \show\r at Ib
+ \show\r at Icspecial
+> \r at Icspecial=macro:
+->{1.3}{1}{}{}{}.
+l. ... \show\r at Ia \show\r at Ib \show\r at Icspecial
> \r at IIa=macro:
->{1.1}{1}{}{}{}.
-l. ......r at Ia \show\r at Ib \show\r at Icfail \show\r at IIa
- \show\r at IIb
+l. ... \show\r at IIa
+ \show\r at IIb \show\r at IIbspecial \show\r at IIc
> \r at IIb=macro:
->{1.2}{1}{}{}{}.
-l. ...... at Ib \show\r at Icfail \show\r at IIa \show\r at IIb
-> \r at IIbfail=macro:
-->{1.2}{1}{}{}{}{}{}{}.
-l. ...\show\r at IIbfail
- \show\r at IIc \show\r at IIIa
+l. ... \show\r at IIa \show\r at IIb
+ \show\r at IIbspecial \show\r at IIc
+> \r at IIbspecial=macro:
+->{1.2}{1}{}{}{}.
+l. ... \show\r at IIa \show\r at IIb \show\r at IIbspecial
+ \show\r at IIc
> \r at IIc=macro:
->{1.3}{1}{}{}{}.
-l. ...\show\r at IIbfail \show\r at IIc
- \show\r at IIIa
+l. ......\show\r at IIb \show\r at IIbspecial \show\r at IIc
> \r at IIIa=macro:
-->{1.1}{1}{title}{section.title}{}.
-l. ...\show\r at IIbfail \show\r at IIc \show\r at IIIa
+->{1.1}{1}{title}{section.title}{test-aux3.dvi}.
+l. ... \show\r at IIIa
Completed box being shipped out [1]
\vbox(627.36243+0.0)x380.0
.\hbox(0.0+0.0)x0.0
@@ -63,7 +62,7 @@ Completed box being shipped out [1]
....\glue(\topskip) 3.55556
....\hbox(6.44444+0.0)x345.0, glue set 317.22218fil
.....\hbox(0.0+0.0)x15.0
-.....\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[1 0 0]} action goto name{section.title}
+.....\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[0 1 1]} action user{/Subtype/Link/A<</Type/Action/S/URI/URI(test-aux3.dvi#section.title)>>}
.....\OT1/cmr/m/n/10 1
.....\OT1/cmr/m/n/10 .
.....\OT1/cmr/m/n/10 1
diff --git a/testfiles/xr-newlabel-4.lvt b/testfiles/xr-newlabel-4.lvt
new file mode 100644
index 0000000..e05d8c8
--- /dev/null
+++ b/testfiles/xr-newlabel-4.lvt
@@ -0,0 +1,45 @@
+\documentclass{book}
+\input{regression-test}
+\begin{filecontents}[force]{test-aux1.aux}
+%aux-file with five arguments
+\newlabel{Ia}{{1.1}{1}{}{}{}}
+\newlabel{Ib}{{1.2}{1}{}{}{}}
+\newlabel{Icspecial}{{1.3}{1}}
+\end{filecontents}
+\begin{filecontents}[force]{test-aux2.aux}
+%aux-file with two arguments
+\newlabel{IIa}{{1.1}{1}}
+\newlabel{IIb}{{1.2}{1}}
+\newlabel{IIbspecial}{{1.2}{1}{}{}{}}%
+\newlabel{IIc}{{1.3}{1}}
+\end{filecontents}
+
+\begin{filecontents}[force]{test-aux3.aux}
+% aux-file with five arguments and destinations
+\newlabel{IIIa}{{1.1}{1}{title}{section.title}{}}
+\end{filecontents}
+
+\usepackage{hyperref} %
+
+% xr-hyper after hyperref
+\usepackage{xr-hyper}
+
+\externaldocument{test-aux1}
+\externaldocument{test-aux2}
+\externaldocument{test-aux3}
+\begin{document}
+\START \showoutput
+
+\makeatletter
+ \show\r at Ia \show\r at Ib \show\r at Icspecial
+
+ \show\r at IIa \show\r at IIb \show\r at IIbspecial \show\r at IIc
+
+ \show\r at IIIa
+
+% should work fine because of hyperref
+\ref{IIIa}
+\end{document}
+
+
+
diff --git a/testfiles/xr-newlabel-4.tlg b/testfiles/xr-newlabel-4.tlg
new file mode 100644
index 0000000..6619d2f
--- /dev/null
+++ b/testfiles/xr-newlabel-4.tlg
@@ -0,0 +1,81 @@
+This is a generated file for the l3build validation system.
+Don't change this file in any respect.
+> \r at Ia=macro:
+->{1.1}{1}{}{}{}.
+l. ... \show\r at Ia
+ \show\r at Ib \show\r at Icspecial
+> \r at Ib=macro:
+->{1.2}{1}{}{}{}.
+l. ... \show\r at Ia \show\r at Ib
+ \show\r at Icspecial
+> \r at Icspecial=macro:
+->{1.3}{1}{}{}{}.
+l. ... \show\r at Ia \show\r at Ib \show\r at Icspecial
+> \r at IIa=macro:
+->{1.1}{1}{}{}{}.
+l. ... \show\r at IIa
+ \show\r at IIb \show\r at IIbspecial \show\r at IIc
+> \r at IIb=macro:
+->{1.2}{1}{}{}{}.
+l. ... \show\r at IIa \show\r at IIb
+ \show\r at IIbspecial \show\r at IIc
+> \r at IIbspecial=macro:
+->{1.2}{1}{}{}{}.
+l. ... \show\r at IIa \show\r at IIb \show\r at IIbspecial
+ \show\r at IIc
+> \r at IIc=macro:
+->{1.3}{1}{}{}{}.
+l. ......\show\r at IIb \show\r at IIbspecial \show\r at IIc
+> \r at IIIa=macro:
+->{1.1}{1}{title}{section.title}{test-aux3.pdf}.
+l. ... \show\r at IIIa
+Completed box being shipped out [1]
+\vbox(627.36243+0.0)x380.0
+.\hbox(0.0+0.0)x0.0
+.\vbox(0.0+0.0)x0.0, glue set - 20.99626fil
+..\kern 0.0
+..\kern 22.0
+..\kern -1.00374
+..\hbox(0.0+0.0)x0.0, glue set - 33.99626fil
+...\kern 0.0
+...\kern 35.0
+...\kern -1.00374
+...\pdfdest name{page.1} xyz
+...\penalty 10000
+...\glue 0.0 plus 1.0fil minus 1.0fil
+..\glue 0.0 plus 1.0fil minus 1.0fil
+.\glue(\lineskip) 0.0
+.\vbox(627.36243+0.0)x380.0
+..\glue 22.0
+..\vbox(605.36243+0.0)x345.0, shifted 35.0
+...\vbox(12.0+0.0)x345.0, glue set 5.55556fil
+....\glue 0.0 plus 1.0fil
+....\hbox(6.44444+0.0)x345.0
+.....\hbox(6.44444+0.0)x345.0, glue set 339.99998fil
+......\glue 0.0 plus 1.0fil
+......\OT1/cmr/m/n/10 1
+...\glue 18.06749
+...\glue(\lineskip) 0.0
+...\vbox(550.0+0.0)x345.0, glue set 540.0fil
+....\write-{}
+....\pdfdest name{Doc-Start} xyz
+....\glue(\topskip) 3.55556
+....\hbox(6.44444+0.0)x345.0, glue set 317.22218fil
+.....\hbox(0.0+0.0)x15.0
+.....\pdfstartlink(*+*)x* attr{/Border[0 0 1]/H/I/C[0 .5 .5]} action user{/Subtype/Link/A<</F(test-aux3.pdf)/S/GoToR/D(section.title)>>}
+.....\OT1/cmr/m/n/10 1
+.....\OT1/cmr/m/n/10 .
+.....\OT1/cmr/m/n/10 1
+.....\pdfendlink
+.....\penalty 10000
+.....\glue(\parfillskip) 0.0 plus 1.0fil
+.....\glue(\rightskip) 0.0
+....\glue 0.0 plus 1.0fil
+....\glue 0.0
+...\glue(\baselineskip) 25.29494
+...\hbox(0.0+0.0)x345.0
+....\hbox(0.0+0.0)x345.0
+.\kern 0.0
+(xr-newlabel-4.aux)
+Package rerunfilecheck Info: File `xr-newlabel-4.out' has not changed.
+(rerunfilecheck) Checksum: D41D8CD98F00B204E9800998ECF8427E;0.
More information about the latex3-commits
mailing list.