diff --git a/base/changes.txt b/base/changes.txt index 186c1fb98..05442a956 100644 --- a/base/changes.txt +++ b/base/changes.txt @@ -5,6 +5,10 @@ It is provided for convenience only. It therefore makes no claims to completeness or accuracy and it contains some references to files that are not part of the distribution. ================================================================================ +2023-05-12 Ulrike Fischer + + * ltxref.dtx + extend \label to store five values and add a hook with argument 2023-05-13 David Carlisle diff --git a/base/doc/ltnews37.tex b/base/doc/ltnews37.tex index 70d1cbde5..f327cade8 100644 --- a/base/doc/ltnews37.tex +++ b/base/doc/ltnews37.tex @@ -358,6 +358,33 @@ \subsection{Groups in \cs{MakeUppercase}} % \githubissue{1021} +\subsection{Extension of the \cs{label} command} + +Previously, in standard \LaTeX{}, the \cs{label} command wrote a \cs{newlabel} declaration into +the \texttt{.aux} file and stored two values in +second argument of this \cs{newlabel} command: +\cs{@currentlabel}, which normally contains the state of the current +counter and \cs{thepage} for the current page number. + +The packages \pkg{hyperref} and +\pkg{nameref} then patched the \cs{label} command to store five values instead. +In addition to the above they saved \cs{@currentlabelname}, which normally contains the +current title text and can be retrieved with \cs{nameref}, and +\cs{@currentHref}, which is the name of the destination needed to create an +active link. The fifth argument was only used if external +references were loaded with the \pkg{xr-hyper} package. + +Starting with this release, the number of values stored in \cs{newlabel} have been unified. +\cs{label} now writes a +\cs{newlabel} command that always contains five values in the second argument (each in a brace group): +\cs{@currentlabel}, \cs{thepage}, \cs{@currentlabelname}, +\cs{@currentHref}, and \cs{@kernel@reserved@label@data} (which is reserved for the kernel). + +Additionally, a hook with the name \texttt{label} has been +added. It takes one argument: the label string. +Code added to the hook can refer to this argument with \verb+#1+. +The hook is executed directly before the \cs{label} command writes to the \texttt{.aux} file +but \emph{after} the \cs{@bsphack} command has done its spacing magic and it is located \emph{inside} a group, thus its code only affects the write operation. \section{Code improvements} diff --git a/base/ltxref.dtx b/base/ltxref.dtx index dcfebf0e7..0084dbfc2 100644 --- a/base/ltxref.dtx +++ b/base/ltxref.dtx @@ -33,7 +33,7 @@ %<*driver> % \fi \ProvidesFile{ltxref.dtx} - [2022/04/12 v1.1p LaTeX Kernel (Cross Referencing)] + [2023/05/16 v1.1q LaTeX Kernel (Cross Referencing)] % \iffalse \documentclass{ltxdoc} \GetFileInfo{ltxref.dtx} @@ -93,6 +93,15 @@ % to align with the use of \pkg{hyperref}. Without \pkg{hyperref} (or some % other package using the starred form) the star is simply ignored. % +% Note: starting with 2023-06-01 |\label| stores also the current value +% of |\@currentlabelname| which should typically contain a (sanitized) title. +% (A reference command |\nameref| is provided by the \pkg{nameref} package.) +% |\label| also stores |\@currentHref| which if set should refer to a target name +% for links. This value is set and used by \pkg{hyperref}. Unlike the other values +% |\@currentHref| should be set globally. A fifth value |\@kernel@reserved@label@data| +% is reserved for the kernel to allow future extensions of the cross-reference +% system. +% % % \MaybeStop{} % @@ -108,7 +117,8 @@ % incremented by the command \refstepcounter{CNT} , which sets % \@currentlabel == {CNT}{eval(\p@cnt\theCNT)}. The command % \label{FOO} then writes the following on file \@auxout : -% \newlabel{FOO}{{eval(\@currentlabel)}{eval(\thepage)}} +% \newlabel{FOO}{{eval(\@currentlabel)}{eval(\thepage)}% +% {eval(\@currentlabelname)}{eval(\@currentHref)}{eval(\@kernel@reserved@label@data)}} % % \ref{FOO} == % BEGIN @@ -228,6 +238,10 @@ % % RmS 93/09/08: Added setting of refundefined switch. % \begin{macrocode} +% +%<*2ekernel|latexrelease> +%\IncludeInRelease{2023/06/01}% +% {\@kernel@sref}{store five arguments}% \def\@setref#1#2#3{% \ifx#1\relax \protect\G@refundefinedtrue @@ -235,19 +249,53 @@ \@latex@warning{Reference `#3' on page \thepage \space undefined}% \else - \expandafter#2#1\null + \expandafter#2#1\@empty\@empty\@empty\null \fi} % \end{macrocode} % \begin{macrocode} -% -%<*2ekernel|latexrelease> +\long\def\@firstoffive#1#2#3#4#5{#1} +\long\def\@secondoffive#1#2#3#4#5{#2} +\def\@kernel@sref#1{\expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}} +\def\@kernel@spageref#1{\expandafter\@setref\csname r@#1\endcsname + \@secondoffive{#1}} +%\EndIncludeInRelease +%\IncludeInRelease{2022/06/01}% +% {\@kernel@sref}{store five arguments}% +%\def\@setref#1#2#3{% +% \ifx#1\relax +% \protect\G@refundefinedtrue +% \nfss@text{\reset@font\bfseries ??}% +% \@latex@warning{Reference `#3' on page \thepage \space +% undefined}% +% \else +% \expandafter#2#1\null +% \fi} +%\let\@firstoffive\undefined +%\let\@secondoffive\undefined +%\def\@kernel@sref#1{\expandafter\@setref\csname r@#1\endcsname\@firstoftwo{#1}} +%\def\@kernel@spageref#1{\expandafter\@setref\csname r@#1\endcsname +% \@secondoftwo{#1}} +%\EndIncludeInRelease +%\IncludeInRelease{0000/00/00}% +% {\@kernel@sref}{store five arguments}% +%\def\@setref#1#2#3{% +% \ifx#1\relax +% \protect\G@refundefinedtrue +% \nfss@text{\reset@font\bfseries ??}% +% \@latex@warning{Reference `#3' on page \thepage \space +% undefined}% +% \else +% \expandafter#2#1\null +% \fi} +%\let\@firstoffive\undefined +%\let\@secondoffive\undefined +%\let\@kernel@sref\undefined +%\let\@kernel@spageref\undefined +%\EndIncludeInRelease %\IncludeInRelease{2022/06/01}% % {\ref}{Add starred reference commands}% % \end{macrocode} % \begin{macrocode} -\def\@kernel@sref#1{\expandafter\@setref\csname r@#1\endcsname\@firstoftwo{#1}} -\def\@kernel@spageref#1{\expandafter\@setref\csname r@#1\endcsname - \@secondoftwo{#1}} \let\@kernel@ref\@kernel@sref \let\@kernel@pageref\@kernel@spageref \NewDocumentCommand\ref{s} @@ -334,6 +382,8 @@ % \begin{macro}{\label} % \changes{v1.1d}{1994/11/04}{(ASAJ)Added \cs{protected@write}} % \changes{v1.1d}{1994/11/04}{(ASAJ)Added \cs{protected@edef}} +% \changes{v1.1q}{2023/05/12}{(UFi)extended to store five arguments} +% \changes{v1.1q}{2023/05/12}{(UFi)added a hook with argument} % The commands |\label| and |\refstepcounter| have been changed to % allow |\protect|'ed commands to work properly. For example, %\begin{verbatim} @@ -343,16 +393,27 @@ % to something like |\foo{4.d}|. Change made 20 Jul 88. % % \begin{macrocode} +% +%<*2ekernel|latexrelease> +%\IncludeInRelease{2023/06/01}% +% {\label}{store five label arguments}% +\providecommand\@currentlabelname{} +\providecommand\@currentHref{} +\providecommand\@kernel@reserved@label@data{} +\NewHookWithArguments{label}{1} \def\label#1{\@bsphack + %\begingroup + \UseHookWithArguments{label}{1}{#1}% \protected@write\@auxout{}% - {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}% + {\string\newlabel{#1}{{\@currentlabel}{\thepage}% + {\@currentlabelname}{\@currentHref}{\@kernel@reserved@label@data}}}% + %\endgroup \@esphack} +%\EndIncludeInRelease % \end{macrocode} % \end{macro} % % \begin{macrocode} -% -%<*2ekernel|latexrelease> %\IncludeInRelease{2022/06/01}% % {\Ref}{Add starred version}% % \end{macrocode} @@ -432,6 +493,16 @@ % \begin{macrocode} % %\EndIncludeInRelease +%\IncludeInRelease{0000/00/00}% +% {\label}{store five label arguments}% +%\let\@currenttitle\@undefined +%\let\@currenttarget\@undefined +%\let\@kernel@currentdata\@undefined +%\def\label#1{\@bsphack +% \protected@write\@auxout{}% +% {\string\newlabel{#1}{{\@currentlabel}{\thepage}}}% +% \@esphack} +%\EndIncludeInRelease %\IncludeInRelease{2020/10/01}% % {\Ref}{Add starred version}% %\def\@currentcounter{} diff --git a/base/testfiles-lthooks/ltcmdhooks-001.tlg b/base/testfiles-lthooks/ltcmdhooks-001.tlg index 5b5fddf67..9338ad7c5 100644 --- a/base/testfiles-lthooks/ltcmdhooks-001.tlg +++ b/base/testfiles-lthooks/ltcmdhooks-001.tlg @@ -81,6 +81,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-000.tlg b/base/testfiles-lthooks/lthooks-000.tlg index 73b07cc83..3ee450bf2 100644 --- a/base/testfiles-lthooks/lthooks-000.tlg +++ b/base/testfiles-lthooks/lthooks-000.tlg @@ -21,6 +21,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-001.tlg b/base/testfiles-lthooks/lthooks-001.tlg index ff96db419..875f60a78 100644 --- a/base/testfiles-lthooks/lthooks-001.tlg +++ b/base/testfiles-lthooks/lthooks-001.tlg @@ -27,6 +27,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: @@ -194,6 +195,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -250,6 +252,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-002.tlg b/base/testfiles-lthooks/lthooks-002.tlg index 422228519..9c02f2956 100644 --- a/base/testfiles-lthooks/lthooks-002.tlg +++ b/base/testfiles-lthooks/lthooks-002.tlg @@ -27,6 +27,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: @@ -196,6 +197,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -252,6 +254,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-003.tlg b/base/testfiles-lthooks/lthooks-003.tlg index c691a4df0..60f241a52 100644 --- a/base/testfiles-lthooks/lthooks-003.tlg +++ b/base/testfiles-lthooks/lthooks-003.tlg @@ -42,6 +42,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -109,6 +110,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-004.tlg b/base/testfiles-lthooks/lthooks-004.tlg index 3d8cac94a..4ee887419 100644 --- a/base/testfiles-lthooks/lthooks-004.tlg +++ b/base/testfiles-lthooks/lthooks-004.tlg @@ -32,6 +32,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -93,6 +94,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-005.tlg b/base/testfiles-lthooks/lthooks-005.tlg index 34929d4c1..5489e2435 100644 --- a/base/testfiles-lthooks/lthooks-005.tlg +++ b/base/testfiles-lthooks/lthooks-005.tlg @@ -49,6 +49,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -116,6 +117,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-006.tlg b/base/testfiles-lthooks/lthooks-006.tlg index c4067f69d..eb3df21c9 100644 --- a/base/testfiles-lthooks/lthooks-006.tlg +++ b/base/testfiles-lthooks/lthooks-006.tlg @@ -30,6 +30,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -89,6 +90,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-007.tlg b/base/testfiles-lthooks/lthooks-007.tlg index 315560c9d..443ecf70e 100644 --- a/base/testfiles-lthooks/lthooks-007.tlg +++ b/base/testfiles-lthooks/lthooks-007.tlg @@ -30,6 +30,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -90,6 +91,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: @@ -255,6 +257,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-008.tlg b/base/testfiles-lthooks/lthooks-008.tlg index 4d08b1d60..f224e0f6d 100644 --- a/base/testfiles-lthooks/lthooks-008.tlg +++ b/base/testfiles-lthooks/lthooks-008.tlg @@ -32,6 +32,7 @@ The sequence \g__hook_all_seq contains the items (without outer braces): > {bfseries/defaults} > {mdseries} > {mdseries/defaults} +> {label} > {enddocument} > {enddocument/afterlastpage} > {enddocument/afteraux} @@ -88,6 +89,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Code labels for sorting: label1, label2 and mypackage diff --git a/base/testfiles-lthooks/lthooks-009.tlg b/base/testfiles-lthooks/lthooks-009.tlg index dbf519bec..4d195dab2 100644 --- a/base/testfiles-lthooks/lthooks-009.tlg +++ b/base/testfiles-lthooks/lthooks-009.tlg @@ -27,6 +27,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-011.tlg b/base/testfiles-lthooks/lthooks-011.tlg index eab84acf4..664d060f7 100644 --- a/base/testfiles-lthooks/lthooks-011.tlg +++ b/base/testfiles-lthooks/lthooks-011.tlg @@ -22,6 +22,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: @@ -185,6 +186,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: @@ -350,6 +352,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: @@ -517,6 +520,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-013.tlg b/base/testfiles-lthooks/lthooks-013.tlg index 07bf74fd3..22c49ad5a 100644 --- a/base/testfiles-lthooks/lthooks-013.tlg +++ b/base/testfiles-lthooks/lthooks-013.tlg @@ -74,6 +74,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-021.tlg b/base/testfiles-lthooks/lthooks-021.tlg index 556e7f31a..41a0d6977 100644 --- a/base/testfiles-lthooks/lthooks-021.tlg +++ b/base/testfiles-lthooks/lthooks-021.tlg @@ -21,6 +21,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-legacy.tlg b/base/testfiles-lthooks/lthooks-legacy.tlg index f75257cea..4f400a3ef 100644 --- a/base/testfiles-lthooks/lthooks-legacy.tlg +++ b/base/testfiles-lthooks/lthooks-legacy.tlg @@ -46,6 +46,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks/lthooks-rollback-args.tlg b/base/testfiles-lthooks/lthooks-rollback-args.tlg index 0a9a63db1..df4efed49 100644 --- a/base/testfiles-lthooks/lthooks-rollback-args.tlg +++ b/base/testfiles-lthooks/lthooks-rollback-args.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles-lthooks2/lthooks2-002.tlg b/base/testfiles-lthooks2/lthooks2-002.tlg index 171e9c953..0437b9b47 100644 --- a/base/testfiles-lthooks2/lthooks2-002.tlg +++ b/base/testfiles-lthooks2/lthooks2-002.tlg @@ -33,6 +33,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks2/lthooks2-005.tlg b/base/testfiles-lthooks2/lthooks2-005.tlg index 145f963e2..46ea30e8c 100644 --- a/base/testfiles-lthooks2/lthooks2-005.tlg +++ b/base/testfiles-lthooks2/lthooks2-005.tlg @@ -22,6 +22,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: @@ -173,6 +174,7 @@ Update code for hook 'bfseries' on input line ...: Update code for hook 'bfseries/defaults' on input line ...: Update code for hook 'mdseries' on input line ...: Update code for hook 'mdseries/defaults' on input line ...: +Update code for hook 'label' on input line ...: Update code for hook 'enddocument' on input line ...: Update code for hook 'enddocument/afterlastpage' on input line ...: Update code for hook 'enddocument/afteraux' on input line ...: diff --git a/base/testfiles-lthooks2/ltpara-006.tlg b/base/testfiles-lthooks2/ltpara-006.tlg index 0b5387325..a4befa59b 100644 --- a/base/testfiles-lthooks2/ltpara-006.tlg +++ b/base/testfiles-lthooks2/ltpara-006.tlg @@ -55,7 +55,7 @@ Completed box being shipped out [1] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{Euler}{{1}{\thepage }}} +.....\write1{\newlabel{Euler}{{1}{\thepage }{}{}{}}} ....\kern140.21014 ....\hbox(7.5+2.5)x12.77782, display .....\hbox(7.5+2.5)x12.77782 diff --git a/base/testfiles/github-0385.tlg b/base/testfiles/github-0385.tlg index cfde00887..ec157a746 100644 --- a/base/testfiles/github-0385.tlg +++ b/base/testfiles/github-0385.tlg @@ -38,7 +38,7 @@ Completed box being shipped out [1] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\write1{\newlabel{foo}{{}{\thepage }}} +...\write1{\newlabel{foo}{{}{\thepage }{}{}{}}} ...\glue -1.94444 ...\glue 0.0 plus 1.0fil ...\glue 0.0 diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg index d91fd4885..2cb641518 100644 --- a/base/testfiles/github-0479-often.luatex.tlg +++ b/base/testfiles/github-0479-often.luatex.tlg @@ -461,9 +461,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg index 88cc8f43c..71fa59da1 100644 --- a/base/testfiles/github-0479-often.tlg +++ b/base/testfiles/github-0479-often.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg index d1fa626bb..3a619edb4 100644 --- a/base/testfiles/github-0479-often.xetex.tlg +++ b/base/testfiles/github-0479-often.xetex.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/github-0881a.tlg b/base/testfiles/github-0881a.tlg index 4f027ce65..eec4508c9 100644 --- a/base/testfiles/github-0881a.tlg +++ b/base/testfiles/github-0881a.tlg @@ -22,7 +22,7 @@ LaTeX Font Info: External font `cmex10' loaded for size .\hbox(0.0+0.0)x0.0 .\OT1/cmr/m/n/10 ) .\glue 3.33333 plus 1.66666 minus 1.11111 -.\write1{\newlabel{lower}{{1}{\thepage }}} +.\write1{\newlabel{lower}{{1}{\thepage }{}{}{}}} .\penalty 10000 .\glue 0.0 .\glue 3.33333 plus 1.66666 minus 1.11111 diff --git a/base/testfiles/tlb-footref-001.tlg b/base/testfiles/tlb-footref-001.tlg index 21ccdb7ed..b853a8271 100644 --- a/base/testfiles/tlb-footref-001.tlg +++ b/base/testfiles/tlb-footref-001.tlg @@ -271,7 +271,7 @@ Completed box being shipped out [1] ........\mathoff ......\hbox(6.65+0.0)x0.0 .......\rule(6.65+0.0)x0.0 -......\write1{\newlabel{B}{{{\itshape a}}{\thepage }}} +......\write1{\newlabel{B}{{{\itshape a}}{\thepage }{}{}{}}} ......\OT1/cmr/m/n/8 I ......\OT1/cmr/m/n/8 n ......\OT1/cmr/m/n/8 s @@ -405,7 +405,7 @@ Completed box being shipped out [1] ......\mathoff ....\hbox(6.65+0.0)x0.0 .....\rule(6.65+0.0)x0.0 -....\write1{\newlabel{A}{{1}{\thepage }}} +....\write1{\newlabel{A}{{1}{\thepage }{}{}{}}} ....\OT1/cmr/m/n/8 A ....\kern-0.23611 ....\OT1/cmr/m/n/8 t diff --git a/base/testfiles/tlb-label-001.lvt b/base/testfiles/tlb-label-001.lvt new file mode 100644 index 000000000..4ef94de67 --- /dev/null +++ b/base/testfiles/tlb-label-001.lvt @@ -0,0 +1,26 @@ +\RequirePackage[enable-debug]{expl3} +\ExplSyntaxOn +\debug_on:n { check-declarations , deprecation } +\ExplSyntaxOff + +\documentclass{article} + +\input{regression-test} + +\DebugHooksOn + +\begin{document} +\START \showoutput +\makeatletter +\AddToHookWithArguments + {label}{\typeout{Setting label #1: + \@currentlabel, \@currentlabelname, \@currentHref}} + +\refstepcounter{section} +\def\@currentlabelname{Titel} +\gdef\@currentHref{Destination} +\label{test} + +\newpage +\end{document} + diff --git a/base/testfiles/tlb-label-001.tlg b/base/testfiles/tlb-label-001.tlg new file mode 100644 index 000000000..56f452806 --- /dev/null +++ b/base/testfiles/tlb-label-001.tlg @@ -0,0 +1,6 @@ +This is a generated file for the l3build validation system. +Don't change this file in any respect. +**** Add to hook label (top-level) on input line ... <- \typeout {Setting label ##1: \@currentlabel , \@currentlabelname , \@currentHref } +Update code for hook 'label' on input line ...: +Setting label test: 1, Titel, Destination +(tlb-label-001.aux) diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg index e9eb2a8ec..16aab082d 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg @@ -424,9 +424,14 @@ Skipping module lttextcomp on input line .... Applying: [....-..-..] Undefine text companion symbols on input line .... LaTeX Info: Redefining \oldstylenums on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Skipping: [....-..-..] Add \labelformat and \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... @@ -1168,9 +1173,14 @@ Skipping module lttextcomp on input line .... Applying: [....-..-..] Undefine text companion symbols on input line .... LaTeX Info: Redefining \oldstylenums on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... Already applied: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg index 6c29fbaf3..ce94cd087 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg @@ -418,9 +418,14 @@ Skipping module lttextcomp on input line .... Applying: [....-..-..] Undefine text companion symbols on input line .... LaTeX Info: Redefining \oldstylenums on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Skipping: [....-..-..] Add \labelformat and \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... @@ -1152,9 +1157,14 @@ Skipping module lttextcomp on input line .... Applying: [....-..-..] Undefine text companion symbols on input line .... LaTeX Info: Redefining \oldstylenums on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... Already applied: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg index 452320809..8e77a8124 100644 --- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg @@ -418,9 +418,14 @@ Skipping module lttextcomp on input line .... Applying: [....-..-..] Undefine text companion symbols on input line .... LaTeX Info: Redefining \oldstylenums on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Skipping: [....-..-..] Add \labelformat and \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... @@ -1161,9 +1166,14 @@ Skipping module lttextcomp on input line .... Applying: [....-..-..] Undefine text companion symbols on input line .... LaTeX Info: Redefining \oldstylenums on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... Already applied: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg index b90d3508f..bb0c1a31a 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.luatex.tlg @@ -461,9 +461,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg index a10978b19..cbb9d1882 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg index af627b6bf..d1be8bfe6 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2020-10-01.xetex.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg index 271cf6e59..8c3d6aa87 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.luatex.tlg @@ -462,9 +462,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg index 9d3243685..10fe7c1a4 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg index 28d0f43f9..6059170c4 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-06-01.xetex.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg index ea669227e..985033490 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.luatex.tlg @@ -462,9 +462,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg index 28c711058..a8d26dce9 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg index 7429c7526..49c6ccd29 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2021-11-15.xetex.tlg @@ -451,9 +451,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg index 7e1ae371f..f05f1ef9f 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg @@ -463,9 +463,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... +Already applied: [....-..-..] store five arguments on input line .... Applying: [....-..-..] Add starred reference commands on input line .... Already applied: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Already applied: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg index de6d1bf82..e788b118b 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg @@ -452,9 +452,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... +Already applied: [....-..-..] store five arguments on input line .... Applying: [....-..-..] Add starred reference commands on input line .... Already applied: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Already applied: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg index 19aca9819..ce62f6366 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg @@ -452,9 +452,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... +Already applied: [....-..-..] store five arguments on input line .... Applying: [....-..-..] Add starred reference commands on input line .... Already applied: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Already applied: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg index eaa1b7c43..a8ebc97ec 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg @@ -463,9 +463,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... +Already applied: [....-..-..] store five arguments on input line .... Applying: [....-..-..] Add starred reference commands on input line .... Already applied: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Already applied: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg index 6a99a3bfe..4ec6a9a51 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg @@ -452,9 +452,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... +Already applied: [....-..-..] store five arguments on input line .... Applying: [....-..-..] Add starred reference commands on input line .... Already applied: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Already applied: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg index 059660268..25c958b59 100644 --- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg +++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg @@ -452,9 +452,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... +Already applied: [....-..-..] store five arguments on input line .... Applying: [....-..-..] Add starred reference commands on input line .... Already applied: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Already applied: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg index aab45cb39..472babc26 100644 --- a/base/testfiles/tlb-rollback-004-often.luatex.tlg +++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg @@ -461,9 +461,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg index 8ac211366..ba880b2c5 100644 --- a/base/testfiles/tlb-rollback-004-often.tlg +++ b/base/testfiles/tlb-rollback-004-often.tlg @@ -450,9 +450,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg index 943b62ee1..3d072fb4c 100644 --- a/base/testfiles/tlb-rollback-004-often.xetex.tlg +++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg @@ -450,9 +450,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... LaTeX Info: Redefining \Ref on input line .... diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg index c87f79d3a..ca944df81 100644 --- a/base/testfiles/tlb-rollback-005.luatex.tlg +++ b/base/testfiles/tlb-rollback-005.luatex.tlg @@ -465,9 +465,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg index b9348a14f..1bcc72bdd 100644 --- a/base/testfiles/tlb-rollback-005.tlg +++ b/base/testfiles/tlb-rollback-005.tlg @@ -455,9 +455,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg index 283a0e84b..d1042fb52 100644 --- a/base/testfiles/tlb-rollback-005.xetex.tlg +++ b/base/testfiles/tlb-rollback-005.xetex.tlg @@ -455,9 +455,14 @@ BEGIN module: lttextcomp (....-..-..) on input line .... Skipping module lttextcomp on input line .... Skipping: [....-..-..] Undefine text companion symbols on input line .... END module: lttextcomp (....-..-..) on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Skipping: [....-..-..] store five arguments on input line .... +Applying: [....-..-..] store five arguments on input line .... Skipping: [....-..-..] Add starred reference commands on input line .... Applying: [....-..-..] Add starred reference commands on input line .... +Skipping: [....-..-..] store five label arguments on input line .... Skipping: [....-..-..] Add starred version on input line .... +Applying: [....-..-..] store five label arguments on input line .... Applying: [....-..-..] Add starred version on input line .... LaTeX Info: Redefining \Ref on input line .... Applying: [....-..-..] Add \labelformat and \Ref on input line .... diff --git a/base/testfiles/tlb00009-fleqn.tlg b/base/testfiles/tlb00009-fleqn.tlg index 8cf2bdba1..782e8815b 100644 --- a/base/testfiles/tlb00009-fleqn.tlg +++ b/base/testfiles/tlb00009-fleqn.tlg @@ -93,7 +93,7 @@ Completed box being shipped out [1] ......\OML/cmm/m/it/10 y ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998 .......\OT1/cmr/m/n/7 1 -......\write1{\newlabel{eqn-1}{{1}{\thepage }}} +......\write1{\newlabel{eqn-1}{{1}{\thepage }{}{}{}}} ......\hbox(0.0+0.0)x0.0 .....\mathoff .....\glue 0.0 plus 1.0fil @@ -136,7 +136,7 @@ Completed box being shipped out [1] ......\OML/cmm/m/it/10 y ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998 .......\OT1/cmr/m/n/7 2 -......\write1{\newlabel{eqn-2}{{2}{\thepage }}} +......\write1{\newlabel{eqn-2}{{2}{\thepage }{}{}{}}} ......\hbox(0.0+0.0)x0.0 .....\mathoff .....\glue 0.0 plus 1.0fil @@ -179,7 +179,7 @@ Completed box being shipped out [1] ......\OML/cmm/m/it/10 y ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998 .......\OT1/cmr/m/n/7 3 -......\write1{\newlabel{eqn-3}{{3}{\thepage }}} +......\write1{\newlabel{eqn-3}{{3}{\thepage }{}{}{}}} .....\mathoff .....\glue 0.0 plus 1.0fil ....\glue(\tabskip) 0.0 plus 1000.0 diff --git a/base/testfiles/tlb0009.tlg b/base/testfiles/tlb0009.tlg index 8a48ee25c..baa2df229 100644 --- a/base/testfiles/tlb0009.tlg +++ b/base/testfiles/tlb0009.tlg @@ -93,7 +93,7 @@ Completed box being shipped out [1] ......\OML/cmm/m/it/10 y ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998 .......\OT1/cmr/m/n/7 1 -......\write1{\newlabel{eqn-1}{{1}{\thepage }}} +......\write1{\newlabel{eqn-1}{{1}{\thepage }{}{}{}}} ......\hbox(0.0+0.0)x0.0 .....\mathoff .....\glue 0.0 plus 1.0fil @@ -136,7 +136,7 @@ Completed box being shipped out [1] ......\OML/cmm/m/it/10 y ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998 .......\OT1/cmr/m/n/7 2 -......\write1{\newlabel{eqn-2}{{2}{\thepage }}} +......\write1{\newlabel{eqn-2}{{2}{\thepage }{}{}{}}} ......\hbox(0.0+0.0)x0.0 .....\mathoff .....\glue 0.0 plus 1.0fil @@ -179,7 +179,7 @@ Completed box being shipped out [1] ......\OML/cmm/m/it/10 y ......\hbox(4.51111+0.0)x4.48613, shifted 1.49998 .......\OT1/cmr/m/n/7 3 -......\write1{\newlabel{eqn-3}{{3}{\thepage }}} +......\write1{\newlabel{eqn-3}{{3}{\thepage }{}{}{}}} .....\mathoff .....\glue 0.0 plus 1.0fil ....\glue(\tabskip) 0.0 plus 1000.0 diff --git a/base/testfiles/tltc001.luatex.tlg b/base/testfiles/tltc001.luatex.tlg index 6ab5adcfb..ca009df61 100644 --- a/base/testfiles/tltc001.luatex.tlg +++ b/base/testfiles/tltc001.luatex.tlg @@ -1642,8 +1642,8 @@ Completed box being shipped out [9] ...\write-{} ...\write-{} ...\write-{} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} ...\glue(\topskip) 0.0 ...\hbox(12.85818+2.79999)x345.0, glue set 223.77994fil, direction TLT ....\localpar diff --git a/base/testfiles/tltc001.tlg b/base/testfiles/tltc001.tlg index e9ec2cebb..8739908f3 100644 --- a/base/testfiles/tltc001.tlg +++ b/base/testfiles/tltc001.tlg @@ -1446,8 +1446,8 @@ Completed box being shipped out [9] ...\write-{} ...\write-{} ...\write-{} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} ...\glue(\topskip) 0.0 ...\hbox(13.03418+2.79999)x345.0, glue set 223.77994fil ....\hbox(13.03418+1.94177)x37.82016 diff --git a/base/testfiles/tltx001.luatex.tlg b/base/testfiles/tltx001.luatex.tlg index 1deab650d..f561295ac 100644 --- a/base/testfiles/tltx001.luatex.tlg +++ b/base/testfiles/tltx001.luatex.tlg @@ -1530,8 +1530,8 @@ Completed box being shipped out [9] ...\write-{} ...\write-{} ...\write-{} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} ...\glue(\topskip) 0.0 ...\hbox(12.85818+2.79999)x345.0, glue set 223.77994fil, direction TLT ....\localpar diff --git a/base/testfiles/tltx001.tlg b/base/testfiles/tltx001.tlg index 3711e507d..4490d6611 100644 --- a/base/testfiles/tltx001.tlg +++ b/base/testfiles/tltx001.tlg @@ -1334,8 +1334,8 @@ Completed box being shipped out [9] ...\write-{} ...\write-{} ...\write-{} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} ...\glue(\topskip) 0.0 ...\hbox(13.03418+2.79999)x345.0, glue set 223.77994fil ....\hbox(13.03418+1.94177)x37.82016 diff --git a/base/testfiles/tltx001.xetex.tlg b/base/testfiles/tltx001.xetex.tlg index 18d12fd9a..20c4cba28 100644 --- a/base/testfiles/tltx001.xetex.tlg +++ b/base/testfiles/tltx001.xetex.tlg @@ -1334,8 +1334,8 @@ Completed box being shipped out [9] ...\write-{} ...\write-{} ...\write-{} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} -...\write1{\newlabel{bla}{{1.1}{\thepage }}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} +...\write1{\newlabel{bla}{{1.1}{\thepage }{}{}{}}} ...\glue(\topskip) 0.0 ...\hbox(13.03418+2.79999)x345.0, glue set 223.77994fil ....\hbox(13.03418+1.94177)x37.82016 diff --git a/base/testfiles/vlatex01.luatex.tlg b/base/testfiles/vlatex01.luatex.tlg index c25a4da68..f9b8fed8d 100644 --- a/base/testfiles/vlatex01.luatex.tlg +++ b/base/testfiles/vlatex01.luatex.tlg @@ -1252,7 +1252,7 @@ l. ...\showbox0 ..\OT1/cmr/m/n/10 n ..\kern-0.27779 (font) ..\OT1/cmr/m/n/10 t -..\write1{\newlabel{tab1}{{}{\thepage }}} +..\write1{\newlabel{tab1}{{}{\thepage }{}{}{}}} ..\penalty 10000 ..\glue 0.0 plus 1.0fil ..\penalty -10000 @@ -1292,7 +1292,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab2}{{}{\thepage }}} +......\write1{\newlabel{tab2}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff @@ -1385,7 +1385,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab3}{{}{\thepage }}} +......\write1{\newlabel{tab3}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff diff --git a/base/testfiles/vlatex01.tlg b/base/testfiles/vlatex01.tlg index a0dd952f6..226a21e8a 100644 --- a/base/testfiles/vlatex01.tlg +++ b/base/testfiles/vlatex01.tlg @@ -1085,7 +1085,7 @@ l. ...\showbox0 ..\OT1/cmr/m/n/10 n ..\kern-0.27779 ..\OT1/cmr/m/n/10 t -..\write1{\newlabel{tab1}{{}{\thepage }}} +..\write1{\newlabel{tab1}{{}{\thepage }{}{}{}}} ..\penalty 10000 ..\glue 0.0 plus 1.0fil ..\penalty -10000 @@ -1125,7 +1125,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab2}{{}{\thepage }}} +......\write1{\newlabel{tab2}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff @@ -1214,7 +1214,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab3}{{}{\thepage }}} +......\write1{\newlabel{tab3}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff diff --git a/base/testfiles/vlatex02.luatex.tlg b/base/testfiles/vlatex02.luatex.tlg index 1d0b51ae9..96c26326b 100644 --- a/base/testfiles/vlatex02.luatex.tlg +++ b/base/testfiles/vlatex02.luatex.tlg @@ -161,7 +161,7 @@ Completed box being shipped out [1] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{Euler}{{1}{\thepage }}} +.....\write1{\newlabel{Euler}{{1}{\thepage }{}{}{}}} ....\kern140.21014 (font) ....\hbox(7.5+2.5)x12.77782, direction TLT .....\hbox(7.5+2.5)x12.77782, direction TLT @@ -705,7 +705,7 @@ Completed box being shipped out [3] ...\glue 12.0 plus 2.0 minus 2.0 ...\vbox(83.47943+0.0)x345.0, direction TLT ....\vbox(83.47943+0.0)x345.0, direction TLT -.....\write1{\newlabel{Fig1}{{1}{\thepage }}} +.....\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} .....\penalty -51 .....\glue 10.0 plus 3.0 minus 5.0 .....\glue(\parskip) 0.0 diff --git a/base/testfiles/vlatex02.tlg b/base/testfiles/vlatex02.tlg index 2c5aad8e8..0380a522a 100644 --- a/base/testfiles/vlatex02.tlg +++ b/base/testfiles/vlatex02.tlg @@ -142,7 +142,7 @@ Completed box being shipped out [1] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{Euler}{{1}{\thepage }}} +.....\write1{\newlabel{Euler}{{1}{\thepage }{}{}{}}} ....\kern140.21014 ....\hbox(7.5+2.5)x12.77782, display .....\hbox(7.5+2.5)x12.77782 @@ -615,7 +615,7 @@ Completed box being shipped out [3] ...\glue 12.0 plus 2.0 minus 2.0 ...\vbox(83.47943+0.0)x345.0 ....\vbox(83.47943+0.0)x345.0 -.....\write1{\newlabel{Fig1}{{1}{\thepage }}} +.....\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} .....\penalty -51 .....\glue 10.0 plus 3.0 minus 5.0 .....\glue(\parskip) 0.0 diff --git a/base/testfiles/vlatex03-2015.luatex.tlg b/base/testfiles/vlatex03-2015.luatex.tlg index c180fb318..8f7ed406b 100644 --- a/base/testfiles/vlatex03-2015.luatex.tlg +++ b/base/testfiles/vlatex03-2015.luatex.tlg @@ -411,7 +411,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(84.47943+0.0)x167.5, direction TLT .......\vbox(84.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig1}{{1}{\thepage }}} +........\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -581,7 +581,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(83.47943+0.0)x167.5, direction TLT .......\vbox(83.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig2}{{1}{\thepage }}} +........\write1{\newlabel{Fig2}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -738,7 +738,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(84.47943+0.0)x167.5, direction TLT .......\vbox(84.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig3}{{1}{\thepage }}} +........\write1{\newlabel{Fig3}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -954,7 +954,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(83.47943+0.0)x167.5, direction TLT .......\vbox(83.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig4}{{1}{\thepage }}} +........\write1{\newlabel{Fig4}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -3051,7 +3051,7 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\write1{\newlabel{last}{{1}{\thepage }}} +...\write1{\newlabel{last}{{1}{\thepage }{}{}{}}} ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil diff --git a/base/testfiles/vlatex03-2015.tlg b/base/testfiles/vlatex03-2015.tlg index 2418208dc..38b9608fb 100644 --- a/base/testfiles/vlatex03-2015.tlg +++ b/base/testfiles/vlatex03-2015.tlg @@ -354,7 +354,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(84.47943+0.0)x167.5 .......\vbox(84.47943+0.0)x167.5 -........\write1{\newlabel{Fig1}{{1}{\thepage }}} +........\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -504,7 +504,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(83.47943+0.0)x167.5 .......\vbox(83.47943+0.0)x167.5 -........\write1{\newlabel{Fig2}{{1}{\thepage }}} +........\write1{\newlabel{Fig2}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -645,7 +645,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(84.47943+0.0)x167.5 .......\vbox(84.47943+0.0)x167.5 -........\write1{\newlabel{Fig3}{{1}{\thepage }}} +........\write1{\newlabel{Fig3}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -836,7 +836,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(83.47943+0.0)x167.5 .......\vbox(83.47943+0.0)x167.5 -........\write1{\newlabel{Fig4}{{1}{\thepage }}} +........\write1{\newlabel{Fig4}{{1}{\thepage }{}{}{}}} ........\penalty -51 ........\glue 10.0 plus 3.0 minus 5.0 ........\glue(\parskip) 0.0 @@ -2706,7 +2706,7 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\write1{\newlabel{last}{{1}{\thepage }}} +...\write1{\newlabel{last}{{1}{\thepage }{}{}{}}} ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil diff --git a/base/testfiles/vlatex05.luatex.tlg b/base/testfiles/vlatex05.luatex.tlg index 23aea8367..3e05f7353 100644 --- a/base/testfiles/vlatex05.luatex.tlg +++ b/base/testfiles/vlatex05.luatex.tlg @@ -1588,7 +1588,7 @@ Completed box being shipped out [2] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }}} +.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }{}{}{}}} ....\kern138.54347 (font) ....\hbox(7.5+2.5)x14.44449, direction TLT .....\hbox(7.5+2.5)x14.44449, direction TLT @@ -2118,7 +2118,7 @@ Completed box being shipped out [3] ....\OML/cmm/m/it/10 y ....\kern0.35878 (italic) ....\glue 1.66663 -....\write1{\newlabel{E1}{{1.1.1}{\thepage }}} +....\write1{\newlabel{E1}{{1.1.1}{\thepage }{}{}{}}} ....\mathoff ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil diff --git a/base/testfiles/vlatex05.tlg b/base/testfiles/vlatex05.tlg index 4f6d3e956..b6bde28af 100644 --- a/base/testfiles/vlatex05.tlg +++ b/base/testfiles/vlatex05.tlg @@ -1374,7 +1374,7 @@ Completed box being shipped out [2] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }}} +.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }{}{}{}}} ....\kern138.54347 ....\hbox(7.5+2.5)x14.44449, display .....\hbox(7.5+2.5)x14.44449 @@ -1836,7 +1836,7 @@ Completed box being shipped out [3] ....\OML/cmm/m/it/10 y ....\kern0.35878 ....\glue 1.66663 -....\write1{\newlabel{E1}{{1.1.1}{\thepage }}} +....\write1{\newlabel{E1}{{1.1.1}{\thepage }{}{}{}}} ....\mathoff ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil diff --git a/base/testfiles/vlatex06-2015.luatex.tlg b/base/testfiles/vlatex06-2015.luatex.tlg index c8efa9932..d816afa0e 100644 --- a/base/testfiles/vlatex06-2015.luatex.tlg +++ b/base/testfiles/vlatex06-2015.luatex.tlg @@ -3307,7 +3307,7 @@ Completed box being shipped out [5] ....\OT1/cmr/bx/n/14.4 l ....\OT1/cmr/bx/n/14.4 e ....\OT1/cmr/bx/n/14.4 ? -....\write1{\newlabel{last:section}{{1.5}{\thepage }}} +....\write1{\newlabel{last:section}{{1.5}{\thepage }{}{}{}}} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/base/testfiles/vlatex06-2015.tlg b/base/testfiles/vlatex06-2015.tlg index 4e4149a7a..b4e3e48d8 100644 --- a/base/testfiles/vlatex06-2015.tlg +++ b/base/testfiles/vlatex06-2015.tlg @@ -2903,7 +2903,7 @@ Completed box being shipped out [5] ....\OT1/cmr/bx/n/14.4 l ....\OT1/cmr/bx/n/14.4 e ....\OT1/cmr/bx/n/14.4 ? -....\write1{\newlabel{last:section}{{1.5}{\thepage }}} +....\write1{\newlabel{last:section}{{1.5}{\thepage }{}{}{}}} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/base/testfiles/vtl2e01.luatex.tlg b/base/testfiles/vtl2e01.luatex.tlg index 9ee34ebbf..13fe21f24 100644 --- a/base/testfiles/vtl2e01.luatex.tlg +++ b/base/testfiles/vtl2e01.luatex.tlg @@ -1252,7 +1252,7 @@ l. ...\showbox0 ..\OT1/cmr/m/n/10 n ..\kern-0.27779 (font) ..\OT1/cmr/m/n/10 t -..\write1{\newlabel{tab1}{{}{\thepage }}} +..\write1{\newlabel{tab1}{{}{\thepage }{}{}{}}} ..\penalty 10000 ..\glue 0.0 plus 1.0fil ..\penalty -10000 @@ -1292,7 +1292,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab2}{{}{\thepage }}} +......\write1{\newlabel{tab2}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff @@ -1385,7 +1385,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab3}{{}{\thepage }}} +......\write1{\newlabel{tab3}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff diff --git a/base/testfiles/vtl2e01.tlg b/base/testfiles/vtl2e01.tlg index 5f3567784..4f5529709 100644 --- a/base/testfiles/vtl2e01.tlg +++ b/base/testfiles/vtl2e01.tlg @@ -1085,7 +1085,7 @@ l. ...\showbox0 ..\OT1/cmr/m/n/10 n ..\kern-0.27779 ..\OT1/cmr/m/n/10 t -..\write1{\newlabel{tab1}{{}{\thepage }}} +..\write1{\newlabel{tab1}{{}{\thepage }{}{}{}}} ..\penalty 10000 ..\glue 0.0 plus 1.0fil ..\penalty -10000 @@ -1125,7 +1125,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab2}{{}{\thepage }}} +......\write1{\newlabel{tab2}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff @@ -1214,7 +1214,7 @@ l. ...\showbox0 ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c ......\OT1/cmr/m/n/10 c -......\write1{\newlabel{tab3}{{}{\thepage }}} +......\write1{\newlabel{tab3}{{}{\thepage }{}{}{}}} ......\glue 6.0 .....\glue(\tabskip) 0.0 ...\mathoff diff --git a/base/testfiles/vtl2e02.luatex.tlg b/base/testfiles/vtl2e02.luatex.tlg index 68ffcfae9..130afdba9 100644 --- a/base/testfiles/vtl2e02.luatex.tlg +++ b/base/testfiles/vtl2e02.luatex.tlg @@ -137,7 +137,7 @@ Completed box being shipped out [1] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{Euler}{{1}{\thepage }}} +.....\write1{\newlabel{Euler}{{1}{\thepage }{}{}{}}} ....\kern140.21014 (font) ....\hbox(7.5+2.5)x12.77782, direction TLT .....\hbox(7.5+2.5)x12.77782, direction TLT @@ -641,7 +641,7 @@ Completed box being shipped out [3] ...\glue 12.0 plus 2.0 minus 2.0 ...\vbox(73.47943+0.0)x345.0, direction TLT ....\vbox(73.47943+0.0)x345.0, direction TLT -.....\write1{\newlabel{Fig1}{{1}{\thepage }}} +.....\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\hbox(39.53499+3.4)x345.0, glue set 27.96fil, direction TLT diff --git a/base/testfiles/vtl2e02.tlg b/base/testfiles/vtl2e02.tlg index 23658c801..010608000 100644 --- a/base/testfiles/vtl2e02.tlg +++ b/base/testfiles/vtl2e02.tlg @@ -119,7 +119,7 @@ Completed box being shipped out [1] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{Euler}{{1}{\thepage }}} +.....\write1{\newlabel{Euler}{{1}{\thepage }{}{}{}}} ....\kern140.21014 ....\hbox(7.5+2.5)x12.77782, display .....\hbox(7.5+2.5)x12.77782 @@ -556,7 +556,7 @@ Completed box being shipped out [3] ...\glue 12.0 plus 2.0 minus 2.0 ...\vbox(73.47943+0.0)x345.0 ....\vbox(73.47943+0.0)x345.0 -.....\write1{\newlabel{Fig1}{{1}{\thepage }}} +.....\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} .....\glue(\parskip) 0.0 .....\glue(\parskip) 0.0 .....\hbox(39.53499+3.4)x345.0, glue set 27.96fil diff --git a/base/testfiles/vtl2e03-2015.luatex.tlg b/base/testfiles/vtl2e03-2015.luatex.tlg index 179a0490a..5e40f5398 100644 --- a/base/testfiles/vtl2e03-2015.luatex.tlg +++ b/base/testfiles/vtl2e03-2015.luatex.tlg @@ -409,7 +409,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(74.47943+0.0)x167.5, direction TLT .......\vbox(74.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig1}{{1}{\thepage }}} +........\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(0.0+0.0)x167.5, glue set 83.75fil, direction TLT @@ -577,7 +577,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(73.47943+0.0)x167.5, direction TLT .......\vbox(73.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig2}{{1}{\thepage }}} +........\write1{\newlabel{Fig2}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(39.53499+3.4)x167.5, glue set 47.615fil, direction TLT @@ -732,7 +732,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(74.47943+0.0)x167.5, direction TLT .......\vbox(74.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig3}{{1}{\thepage }}} +........\write1{\newlabel{Fig3}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(0.0+0.0)x167.5, glue set 83.75fil, direction TLT @@ -955,7 +955,7 @@ Completed box being shipped out [2] ......\glue 8.0 plus 2.0fil ......\vbox(73.47943+0.0)x167.5, direction TLT .......\vbox(73.47943+0.0)x167.5, direction TLT -........\write1{\newlabel{Fig4}{{1}{\thepage }}} +........\write1{\newlabel{Fig4}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(39.53499+3.4)x167.5, glue set 47.615fil, direction TLT @@ -3068,7 +3068,7 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\write1{\newlabel{last}{{1}{\thepage }}} +...\write1{\newlabel{last}{{1}{\thepage }{}{}{}}} ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil diff --git a/base/testfiles/vtl2e03-2015.tlg b/base/testfiles/vtl2e03-2015.tlg index 3bd26e386..31885c857 100644 --- a/base/testfiles/vtl2e03-2015.tlg +++ b/base/testfiles/vtl2e03-2015.tlg @@ -352,7 +352,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(74.47943+0.0)x167.5 .......\vbox(74.47943+0.0)x167.5 -........\write1{\newlabel{Fig1}{{1}{\thepage }}} +........\write1{\newlabel{Fig1}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(0.0+0.0)x167.5, glue set 83.75fil @@ -500,7 +500,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(73.47943+0.0)x167.5 .......\vbox(73.47943+0.0)x167.5 -........\write1{\newlabel{Fig2}{{1}{\thepage }}} +........\write1{\newlabel{Fig2}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(39.53499+3.4)x167.5, glue set 47.615fil @@ -639,7 +639,7 @@ Completed box being shipped out [2] ......\glue 12.0 plus 2.0 minus 2.0 ......\vbox(74.47943+0.0)x167.5 .......\vbox(74.47943+0.0)x167.5 -........\write1{\newlabel{Fig3}{{1}{\thepage }}} +........\write1{\newlabel{Fig3}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(0.0+0.0)x167.5, glue set 83.75fil @@ -837,7 +837,7 @@ Completed box being shipped out [2] ......\glue 8.0 plus 2.0fil ......\vbox(73.47943+0.0)x167.5 .......\vbox(73.47943+0.0)x167.5 -........\write1{\newlabel{Fig4}{{1}{\thepage }}} +........\write1{\newlabel{Fig4}{{1}{\thepage }{}{}{}}} ........\glue(\parskip) 0.0 ........\glue(\parskip) 0.0 ........\hbox(39.53499+3.4)x167.5, glue set 47.615fil @@ -2723,7 +2723,7 @@ Completed box being shipped out [5] ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 -...\write1{\newlabel{last}{{1}{\thepage }}} +...\write1{\newlabel{last}{{1}{\thepage }{}{}{}}} ...\glue 0.0 plus 1.0fil ...\glue 0.0 ...\glue 0.0 plus 0.0001fil diff --git a/base/testfiles/vtl2e05.luatex.tlg b/base/testfiles/vtl2e05.luatex.tlg index dfb3fdd29..2cc2fcf29 100644 --- a/base/testfiles/vtl2e05.luatex.tlg +++ b/base/testfiles/vtl2e05.luatex.tlg @@ -1810,7 +1810,7 @@ Completed box being shipped out [2] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }}} +.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }{}{}{}}} ....\kern138.54347 (font) ....\hbox(7.5+2.5)x14.44449, direction TLT .....\hbox(7.5+2.5)x14.44449, direction TLT @@ -2238,7 +2238,7 @@ Completed box being shipped out [2] ....\OML/cmm/m/it/10 y ....\kern0.35878 (italic) ....\glue 1.66663 -....\write1{\newlabel{E1}{{1.1.1}{\thepage }}} +....\write1{\newlabel{E1}{{1.1.1}{\thepage }{}{}{}}} ....\mathoff ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil diff --git a/base/testfiles/vtl2e05.tlg b/base/testfiles/vtl2e05.tlg index 2cde27154..c9fc6fe32 100644 --- a/base/testfiles/vtl2e05.tlg +++ b/base/testfiles/vtl2e05.tlg @@ -1578,7 +1578,7 @@ Completed box being shipped out [2] .....\glue(\thickmuskip) 2.77771 plus 2.77771 .....\OMS/cmsy/m/n/10 ^^@ .....\OT1/cmr/m/n/10 1 -.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }}} +.....\write1{\newlabel{euler}{{{\protect \sf A}}{\thepage }{}{}{}}} ....\kern138.54347 ....\hbox(7.5+2.5)x14.44449, display .....\hbox(7.5+2.5)x14.44449 @@ -1960,7 +1960,7 @@ Completed box being shipped out [2] ....\OML/cmm/m/it/10 y ....\kern0.35878 ....\glue 1.66663 -....\write1{\newlabel{E1}{{1.1.1}{\thepage }}} +....\write1{\newlabel{E1}{{1.1.1}{\thepage }{}{}{}}} ....\mathoff ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil diff --git a/base/testfiles/vtl2e06.luatex.tlg b/base/testfiles/vtl2e06.luatex.tlg index 71efc5ba4..508bd2800 100644 --- a/base/testfiles/vtl2e06.luatex.tlg +++ b/base/testfiles/vtl2e06.luatex.tlg @@ -3303,7 +3303,7 @@ Completed box being shipped out [5] ....\OT1/cmr/bx/n/14.4 l ....\OT1/cmr/bx/n/14.4 e ....\OT1/cmr/bx/n/14.4 ? -....\write1{\newlabel{last:section}{{1.5}{\thepage }}} +....\write1{\newlabel{last:section}{{1.5}{\thepage }{}{}{}}} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/base/testfiles/vtl2e06.tlg b/base/testfiles/vtl2e06.tlg index 473fa54ab..cdb29fb02 100644 --- a/base/testfiles/vtl2e06.tlg +++ b/base/testfiles/vtl2e06.tlg @@ -2899,7 +2899,7 @@ Completed box being shipped out [5] ....\OT1/cmr/bx/n/14.4 l ....\OT1/cmr/bx/n/14.4 e ....\OT1/cmr/bx/n/14.4 ? -....\write1{\newlabel{last:section}{{1.5}{\thepage }}} +....\write1{\newlabel{last:section}{{1.5}{\thepage }{}{}{}}} ....\penalty 10000 ....\glue(\parfillskip) 0.0 plus 1.0fil ....\glue(\rightskip) 0.0 diff --git a/required/amsmath/testfiles/amsldoc-1.luatex.tlg b/required/amsmath/testfiles/amsldoc-1.luatex.tlg index 037845856..956cf535d 100644 --- a/required/amsmath/testfiles/amsldoc-1.luatex.tlg +++ b/required/amsmath/testfiles/amsldoc-1.luatex.tlg @@ -267,7 +267,7 @@ Completed box being shipped out [1] ..........\OT1/cmr/m/n/10 2 ..........\kern0.0 (italic) ..........\OT1/cmr/m/n/10 ) -.........\write1{\newlabel{xx}{{2}{\thepage }}} +.........\write1{\newlabel{xx}{{2}{\thepage }{}{}{}}} ......\glue(\tabskip) 0.0 .....\penalty 10000 .....\glue 0.0 diff --git a/required/amsmath/testfiles/amsldoc-1.tlg b/required/amsmath/testfiles/amsldoc-1.tlg index eab4b66b2..fcd1a640b 100644 --- a/required/amsmath/testfiles/amsldoc-1.tlg +++ b/required/amsmath/testfiles/amsldoc-1.tlg @@ -247,7 +247,7 @@ Completed box being shipped out [1] ..........\OT1/cmr/m/n/10 2 ..........\kern 0.0 ..........\OT1/cmr/m/n/10 ) -.........\write1{\newlabel{xx}{{2}{\thepage }}} +.........\write1{\newlabel{xx}{{2}{\thepage }{}{}{}}} ......\glue(\tabskip) 0.0 .....\penalty 10000 .....\glue 0.0 diff --git a/required/amsmath/testfiles/amsldoc-2.luatex.tlg b/required/amsmath/testfiles/amsldoc-2.luatex.tlg index 760e1a04c..8f4ceb2f9 100644 --- a/required/amsmath/testfiles/amsldoc-2.luatex.tlg +++ b/required/amsmath/testfiles/amsldoc-2.luatex.tlg @@ -543,7 +543,7 @@ Completed box being shipped out [1] ..........\OT1/cmr/m/n/10 2 ..........\kern0.0 (italic) ..........\OT1/cmr/m/n/10 ) -.........\write1{\newlabel{e:barwq}{{2}{\thepage }}} +.........\write1{\newlabel{e:barwq}{{2}{\thepage }{}{}{}}} ......\glue(\tabskip) 0.0 .....\penalty 10000 .....\glue 0.0 diff --git a/required/amsmath/testfiles/amsldoc-2.tlg b/required/amsmath/testfiles/amsldoc-2.tlg index 9cf918f55..1c4491a64 100644 --- a/required/amsmath/testfiles/amsldoc-2.tlg +++ b/required/amsmath/testfiles/amsldoc-2.tlg @@ -510,7 +510,7 @@ Completed box being shipped out [1] ..........\OT1/cmr/m/n/10 2 ..........\kern 0.0 ..........\OT1/cmr/m/n/10 ) -.........\write1{\newlabel{e:barwq}{{2}{\thepage }}} +.........\write1{\newlabel{e:barwq}{{2}{\thepage }{}{}{}}} ......\glue(\tabskip) 0.0 .....\penalty 10000 .....\glue 0.0 diff --git a/required/amsmath/testfiles/amsldoc-2.xetex.tlg b/required/amsmath/testfiles/amsldoc-2.xetex.tlg index 84015a442..cbfbbe5ed 100644 --- a/required/amsmath/testfiles/amsldoc-2.xetex.tlg +++ b/required/amsmath/testfiles/amsldoc-2.xetex.tlg @@ -531,7 +531,7 @@ Completed box being shipped out [1] ..........\OT1/cmr/m/n/10 2 ..........\kern 0.0 ..........\OT1/cmr/m/n/10 ) -.........\write1{\newlabel{e:barwq}{{2}{\thepage }}} +.........\write1{\newlabel{e:barwq}{{2}{\thepage }{}{}{}}} ......\glue(\tabskip) 0.0 .....\penalty 10000 .....\glue 0.0 diff --git a/required/amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg b/required/amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg index fa8fb6470..547b55ff2 100644 --- a/required/amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg +++ b/required/amsmath/testfiles/amsldoc-4-fleqn.luatex.tlg @@ -328,7 +328,7 @@ Completed box being shipped out [1] .......\OT1/cmr/m/n/10 1 .......\kern0.0 (italic) .......\OT1/cmr/m/n/10 ) -......\write1{\newlabel{eq:C}{{1}{\thepage }}} +......\write1{\newlabel{eq:C}{{1}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0 ...\glue(\parskip) 0.0 plus 1.0 @@ -955,7 +955,7 @@ Completed box being shipped out [1] .......\OT1/cmr/m/n/10 5 .......\kern0.0 (italic) .......\OT1/cmr/m/n/10 ) -......\write1{\newlabel{eq:D}{{5}{\thepage }}} +......\write1{\newlabel{eq:D}{{5}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0 ...\glue -5.0 diff --git a/required/amsmath/testfiles/amsldoc-4-fleqn.tlg b/required/amsmath/testfiles/amsldoc-4-fleqn.tlg index 189e3efc5..6db9dfd00 100644 --- a/required/amsmath/testfiles/amsldoc-4-fleqn.tlg +++ b/required/amsmath/testfiles/amsldoc-4-fleqn.tlg @@ -316,7 +316,7 @@ Completed box being shipped out [1] .......\OT1/cmr/m/n/10 1 .......\kern 0.0 .......\OT1/cmr/m/n/10 ) -......\write1{\newlabel{eq:C}{{1}{\thepage }}} +......\write1{\newlabel{eq:C}{{1}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0 ...\glue(\parskip) 0.0 plus 1.0 @@ -913,7 +913,7 @@ Completed box being shipped out [1] .......\OT1/cmr/m/n/10 5 .......\kern 0.0 .......\OT1/cmr/m/n/10 ) -......\write1{\newlabel{eq:D}{{5}{\thepage }}} +......\write1{\newlabel{eq:D}{{5}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayskip) 10.0 plus 2.0 minus 5.0 ...\glue -5.0 diff --git a/required/amsmath/testfiles/amsldoc-4.luatex.tlg b/required/amsmath/testfiles/amsldoc-4.luatex.tlg index 4ea3890d6..0706bc70f 100644 --- a/required/amsmath/testfiles/amsldoc-4.luatex.tlg +++ b/required/amsmath/testfiles/amsldoc-4.luatex.tlg @@ -320,7 +320,7 @@ Completed box being shipped out [1] ......\OT1/cmr/m/n/10 1 ......\kern0.0 (italic) ......\OT1/cmr/m/n/10 ) -.....\write1{\newlabel{eq:C}{{1}{\thepage }}} +.....\write1{\newlabel{eq:C}{{1}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0 ...\glue(\parskip) 0.0 plus 1.0 @@ -944,7 +944,7 @@ Completed box being shipped out [1] ......\OT1/cmr/m/n/10 5 ......\kern0.0 (italic) ......\OT1/cmr/m/n/10 ) -.....\write1{\newlabel{eq:D}{{5}{\thepage }}} +.....\write1{\newlabel{eq:D}{{5}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0 ...\glue -5.0 diff --git a/required/amsmath/testfiles/amsldoc-4.tlg b/required/amsmath/testfiles/amsldoc-4.tlg index c048fadad..7eb2b5919 100644 --- a/required/amsmath/testfiles/amsldoc-4.tlg +++ b/required/amsmath/testfiles/amsldoc-4.tlg @@ -307,7 +307,7 @@ Completed box being shipped out [1] ......\OT1/cmr/m/n/10 1 ......\kern 0.0 ......\OT1/cmr/m/n/10 ) -.....\write1{\newlabel{eq:C}{{1}{\thepage }}} +.....\write1{\newlabel{eq:C}{{1}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0 ...\glue(\parskip) 0.0 plus 1.0 @@ -900,7 +900,7 @@ Completed box being shipped out [1] ......\OT1/cmr/m/n/10 5 ......\kern 0.0 ......\OT1/cmr/m/n/10 ) -.....\write1{\newlabel{eq:D}{{5}{\thepage }}} +.....\write1{\newlabel{eq:D}{{5}{\thepage }{}{}{}}} ...\penalty 0 ...\glue(\belowdisplayshortskip) 6.0 plus 3.0 minus 3.0 ...\glue -5.0 diff --git a/required/tools/changes.txt b/required/tools/changes.txt index db99755b4..fc1a9fc08 100644 --- a/required/tools/changes.txt +++ b/required/tools/changes.txt @@ -4,6 +4,9 @@ It is provided for convenience only. It therefore makes no claims to completeness or accuracy and it contains some references to files that are not part of the distribution. ======================================================================= +2023-05-11 Ulrike Fischer + + * showkeys.dtx: Use label hook if format new enough. 2023-04-15 David Carlisle diff --git a/required/tools/showkeys.dtx b/required/tools/showkeys.dtx index 3aed90d30..5407e4b63 100644 --- a/required/tools/showkeys.dtx +++ b/required/tools/showkeys.dtx @@ -39,7 +39,7 @@ % \ProvidesFile{showkeys.drv} % \fi % \ProvidesFile{showkeys.dtx} - [2022/04/12 v3.18 Show cite and label keys (DPC, MH)] + [2023/05/11 v3.19 Show cite and label keys (DPC, MH)] % % \iffalse %<*driver> @@ -342,16 +342,20 @@ % \begin{macro}{\label} % \changes{v3.09}{1996/08/30} % {Add extra group so brace hack works. Donald Arseneau tools/2147} +% \changes{v3.19}{2023/05/11} +% {Use label hook if format is new enough.} % The new definition, print the argument, and then do the old % definition. % \begin{macrocode} -\def\label#1{% +\@ifl@t@r\fmtversion{2023-06-01} + {\AddToHookWithArguments{label}{\SK@\SK@@label{#1}}} + {\def\label#1{% \@bsphack \SK@\SK@@label{#1}% \begingroup \SK@label{#1}% \endgroup - \@esphack} + \@esphack}} % \end{macrocode} % \end{macro} % diff --git a/required/tools/testfiles-search/tlb-varioref-001.tlg b/required/tools/testfiles-search/tlb-varioref-001.tlg index 8af0f74a0..e8881f654 100644 --- a/required/tools/testfiles-search/tlb-varioref-001.tlg +++ b/required/tools/testfiles-search/tlb-varioref-001.tlg @@ -31,7 +31,7 @@ Completed box being shipped out [1] ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}A-head}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\write1{\newlabel{A}{{sect: 1}{\thepage }}} +...\write1{\newlabel{A}{{sect: 1}{\thepage }{}{}{}}} ...\penalty 10000 ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -1341,7 +1341,7 @@ Completed box being shipped out [4] ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}B-head}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\write1{\newlabel{B}{{sect: 2}{\thepage }}} +...\write1{\newlabel{B}{{sect: 2}{\thepage }{}{}{}}} ...\penalty 10000 ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/required/tools/testfiles-search/tlb-varioref-002.tlg b/required/tools/testfiles-search/tlb-varioref-002.tlg index c169775cc..f6b5f67ef 100644 --- a/required/tools/testfiles-search/tlb-varioref-002.tlg +++ b/required/tools/testfiles-search/tlb-varioref-002.tlg @@ -31,7 +31,7 @@ Completed box being shipped out [1] ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}A-head}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\write1{\newlabel{A}{{sect: 1}{\thepage }}} +...\write1{\newlabel{A}{{sect: 1}{\thepage }{}{}{}}} ...\penalty 10000 ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -1289,7 +1289,7 @@ Completed box being shipped out [4] ...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {2}B-head}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 9.90276 plus 0.86108 -...\write1{\newlabel{B}{{sect: 2}{\thepage }}} +...\write1{\newlabel{B}{{sect: 2}{\thepage }{}{}{}}} ...\penalty 10000 ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 diff --git a/required/tools/testfiles/tlb4159.luatex.tlg b/required/tools/testfiles/tlb4159.luatex.tlg new file mode 100644 index 000000000..c0c3e5902 --- /dev/null +++ b/required/tools/testfiles/tlb4159.luatex.tlg @@ -0,0 +1,309 @@ +This is a generated file for the LaTeX2e validation system. +Don't change this file in any respect. +(tlb4159.aux) +LaTeX Font Info: Checking defaults for OML/cmm/m/it on input line .... +LaTeX Font Info: ... okay on input line .... +LaTeX Font Info: Checking defaults for OMS/cmsy/m/n on input line .... +LaTeX Font Info: ... okay on input line .... +LaTeX Font Info: Checking defaults for OT1/cmr/m/n on input line .... +LaTeX Font Info: ... okay on input line .... +LaTeX Font Info: Checking defaults for T1/cmr/m/n on input line .... +LaTeX Font Info: ... okay on input line .... +LaTeX Font Info: Checking defaults for TS1/cmr/m/n on input line .... +LaTeX Font Info: ... okay on input line .... +LaTeX Font Info: Checking defaults for OMX/cmex/m/n on input line .... +LaTeX Font Info: ... okay on input line .... +LaTeX Font Info: Checking defaults for U/cmr/m/n on input line .... +LaTeX Font Info: ... okay on input line .... +Completed box being shipped out [1] +\vbox(633.0+0.0)x407.0, direction TLT +.\glue 16.0 +.\vbox(617.0+0.0)x345.0, shifted 62.0, direction TLT +..\vbox(12.0+0.0)x345.0, glue set 12.0fil, direction TLT +...\glue 0.0 plus 1.0fil +...\hbox(0.0+0.0)x345.0, direction TLT +....\hbox(0.0+0.0)x345.0, direction TLT +..\glue 25.0 +..\glue(\lineskip) 0.0 +..\vbox(550.0+0.0)x345.0, glue set 446.68158fil, direction TLT +...\write-{} +...\glue(\topskip) 0.00002 +...\hbox(9.99998+0.0)x345.0, glue set 223.0018fil, direction TLT +....\localpar +.....\localinterlinepenalty=0 +.....\localbrokenpenalty=0 +.....\localleftbox=null +.....\localrightbox=null +....\hbox(9.27998+0.0)x24.29997, direction TLT +.....\glue 0.0 +.....\OT1/cmr/bx/n/14.4 1 +.....\glue 16.19998 +....\OT1/cmr/bx/n/14.4 R +....\OT1/cmr/bx/n/14.4 e +....\OT1/cmr/bx/n/14.4 a +....\OT1/cmr/bx/n/14.4 l +....\glue(\spaceskip) 5.4 plus 2.7 minus 1.79999 +....\OT1/cmr/bx/n/14.4 n +....\kern-0.45001 (font) +....\OT1/cmr/bx/n/14.4 u +....\OT1/cmr/bx/n/14.4 m +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/14.4 - +.....= \kern-0.45001 (font) +....\OT1/cmr/bx/n/14.4 b +....\kern0.45 (font) +....\OT1/cmr/bx/n/14.4 e +....\OT1/cmr/bx/n/14.4 r +....\OT1/cmr/bx/n/14.4 s +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\write1{\@writefile{toc}{\protect \contentsline {section}{\protect \numberline {1}Real numbers}{\thepage }{}\protected@file@percent }} +...\penalty 10000 +...\glue 9.90276 plus 0.86108 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\baselineskip) 5.05556 +...\hbox(6.94444+1.94444)x345.0, glue set 67.44402fil, direction TLT +....\localpar +.....\localinterlinepenalty=0 +.....\localbrokenpenalty=0 +.....\localleftbox=null +.....\localrightbox=null +....\OT1/cmr/m/n/10 T +....\OT1/cmr/m/n/10 h +....\OT1/cmr/m/n/10 e +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 s +....\OT1/cmr/m/n/10 e +....\OT1/cmr/m/n/10 c +....\discretionary (penalty 50) +.....< \OT1/cmr/m/n/10 - +....\OT1/cmr/m/n/10 t +....\OT1/cmr/m/n/10 i +....\OT1/cmr/m/n/10 o +....\OT1/cmr/m/n/10 n +....\penalty 10000 +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 1 +....\OT1/cmr/m/n/10 . +....\OT1/cmr/m/n/10 1 +....\hbox(0.0+0.0)x0.0, direction TLT +....\write1{\newlabel{1@xvr}{{}{\thepage }}} +....\write1{\newlabel{1@vr}{{}{\thepage }}} +....\OT1/cmr/m/n/10 , +....\glue(\spaceskip) 3.33333 plus 2.08331 minus 0.88889 +....\OT1/cmr/m/n/10 . +....\OT1/cmr/m/n/10 . +....\OT1/cmr/m/n/10 . +....\glue(\spaceskip) 4.44444 plus 4.99997 minus 0.37036 +....\OT1/cmr/m/n/10 T +....\OT1/cmr/m/n/10 h +....\OT1/cmr/m/n/10 e +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 s +....\OT1/cmr/m/n/10 e +....\OT1/cmr/m/n/10 c +....\discretionary (penalty 50) +.....< \OT1/cmr/m/n/10 - +....\OT1/cmr/m/n/10 t +....\OT1/cmr/m/n/10 i +....\OT1/cmr/m/n/10 o +....\OT1/cmr/m/n/10 n +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 \ (ligature ``) +....\OT1/cmr/m/n/10 P +....\kern-0.27779 (font) +....\OT1/cmr/m/n/10 a +....\OT1/cmr/m/n/10 r +....\discretionary (penalty 50) +.....< \OT1/cmr/m/n/10 - +....\OT1/cmr/m/n/10 i +....\OT1/cmr/m/n/10 t +....\kern-0.27779 (font) +....\OT1/cmr/m/n/10 y +....\OT1/cmr/m/n/10 " (ligature '') +....\write1{\newlabel{2@xvr}{{}{\thepage }}} +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 o +....\OT1/cmr/m/n/10 n +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 t +....\OT1/cmr/m/n/10 h +....\OT1/cmr/m/n/10 e +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 c +....\OT1/cmr/m/n/10 u +....\OT1/cmr/m/n/10 r +....\discretionary (penalty 50) +.....< \OT1/cmr/m/n/10 - +....\OT1/cmr/m/n/10 r +....\OT1/cmr/m/n/10 e +....\OT1/cmr/m/n/10 n +....\kern-0.27779 (font) +....\OT1/cmr/m/n/10 t +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 p +....\OT1/cmr/m/n/10 a +....\OT1/cmr/m/n/10 g +....\OT1/cmr/m/n/10 e +....\write1{\newlabel{2@vr}{{}{\thepage }}} +....\glue(\spaceskip) 3.33333 plus 1.66666 minus 1.11111 +....\OT1/cmr/m/n/10 . +....\OT1/cmr/m/n/10 . +....\OT1/cmr/m/n/10 . +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\penalty -300 +...\glue 13.99301 plus 4.30554 minus 0.86108 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\baselineskip) 3.72224 +...\hbox(8.33331+0.0)x345.0, glue set 250.41805fil, direction TLT +....\localpar +.....\localinterlinepenalty=0 +.....\localbrokenpenalty=0 +.....\localleftbox=null +.....\localrightbox=null +....\hbox(7.73332+0.0)x30.75, direction TLT +.....\glue 0.0 +.....\OT1/cmr/bx/n/12 1 +.....\OT1/cmr/bx/n/12 . +.....\OT1/cmr/bx/n/12 1 +.....\glue 13.5 +....\OT1/cmr/bx/n/12 D +....\OT1/cmr/bx/n/12 e +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/12 - +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/12 f +.....< \OT1/cmr/bx/n/12 - +.....> \OT1/cmr/bx/n/12 i +.....= \OT1/cmr/bx/n/12 ^^L (ligature fi) +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/12 - +....\OT1/cmr/bx/n/12 n +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/12 - +....\OT1/cmr/bx/n/12 i +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/12 - +....\OT1/cmr/bx/n/12 t +....\OT1/cmr/bx/n/12 i +....\OT1/cmr/bx/n/12 o +....\OT1/cmr/bx/n/12 n +....\OT1/cmr/bx/n/12 s +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {1.1}Definitions}{\thepage }{}\protected@file@percent }} +...\penalty 10000 +...\glue 6.45831 plus 0.86108 +...\write1{\newlabel{sec-def}{{1.1}{\thepage }{}{}{}}} +...\penalty 10000 +...\penalty 10000 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\baselineskip) 5.05556 +...\hbox(6.94444+0.0)x345.0, glue set 212.13127fil, direction TLT +....\localpar +.....\localinterlinepenalty=0 +.....\localbrokenpenalty=0 +.....\localleftbox=null +.....\localrightbox=null +....\hbox(6.44444+0.0)x35.1387, direction TLT +.....\glue 0.0 +.....\OT1/cmr/bx/n/10 1 +.....\OT1/cmr/bx/n/10 . +.....\OT1/cmr/bx/n/10 1 +.....\OT1/cmr/bx/n/10 . +.....\OT1/cmr/bx/n/10 1 +.....\glue 11.49994 +....\OT1/cmr/bx/n/10 G +....\OT1/cmr/bx/n/10 e +....\OT1/cmr/bx/n/10 n +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/10 - +....\OT1/cmr/bx/n/10 e +....\OT1/cmr/bx/n/10 r +....\OT1/cmr/bx/n/10 a +....\OT1/cmr/bx/n/10 l +....\glue(\spaceskip) 3.83331 plus 1.91666 minus 1.27777 +....\OT1/cmr/bx/n/10 D +....\OT1/cmr/bx/n/10 e +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/10 - +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/10 f +.....< \OT1/cmr/bx/n/10 - +.....> \OT1/cmr/bx/n/10 i +.....= \OT1/cmr/bx/n/10 ^^L (ligature fi) +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/10 - +....\OT1/cmr/bx/n/10 n +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/10 - +....\OT1/cmr/bx/n/10 i +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/10 - +....\OT1/cmr/bx/n/10 t +....\OT1/cmr/bx/n/10 i +....\OT1/cmr/bx/n/10 o +....\OT1/cmr/bx/n/10 n +....\OT1/cmr/bx/n/10 s +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\write1{\@writefile{toc}{\protect \contentsline {subsubsection}{\protect \numberline {1.1.1}General Definitions}{\thepage }{}\protected@file@percent }} +...\penalty 10000 +...\penalty 10000 +...\glue 6.45831 plus 0.86108 +...\glue(\parskip) 0.0 plus 1.0 +...\glue(\parskip) 0.0 +...\glue(\baselineskip) 5.05556 +...\hbox(6.94444+1.94444)x345.0, glue set 278.57675fil, direction TLT +....\localpar +.....\localinterlinepenalty=0 +.....\localbrokenpenalty=0 +.....\localleftbox=null +.....\localrightbox=null +....\hbox(6.44444+0.0)x35.1387, direction TLT +.....\glue 0.0 +.....\OT1/cmr/bx/n/10 1 +.....\OT1/cmr/bx/n/10 . +.....\OT1/cmr/bx/n/10 1 +.....\OT1/cmr/bx/n/10 . +.....\OT1/cmr/bx/n/10 2 +.....\glue 11.49994 +....\OT1/cmr/bx/n/10 P +....\kern-0.31944 (font) +....\OT1/cmr/bx/n/10 a +....\OT1/cmr/bx/n/10 r +....\discretionary (penalty 50) +.....< \OT1/cmr/bx/n/10 - +....\OT1/cmr/bx/n/10 i +....\OT1/cmr/bx/n/10 t +....\kern-0.31944 (font) +....\OT1/cmr/bx/n/10 y +....\penalty 10000 +....\glue(\parfillskip) 0.0 plus 1.0fil +....\glue(\rightskip) 0.0 +...\write1{\@writefile{toc}{\protect \contentsline {subsubsection}{\protect \numberline {1.1.2}Parity}{\thepage }{}\protected@file@percent }} +...\penalty 10000 +...\penalty 10000 +...\glue 6.45831 plus 0.86108 +...\write1{\newlabel{subsec-parity}{{1.1.2}{\thepage }{}{}{}}} +...\penalty 10000 +...\penalty 10000 +...\glue -1.94444 +...\glue 0.0 plus 1.0fil +...\glue 0.0 +...\glue 0.0 plus 0.0001fil +..\glue(\baselineskip) 23.55556 +..\hbox(6.44444+0.0)x345.0, direction TLT +...\hbox(6.44444+0.0)x345.0, glue set 170.0fil, direction TLT +....\glue 0.0 plus 1.0fil +....\OT1/cmr/m/n/10 1 +....\glue 0.0 plus 1.0fil +(tlb4159.aux) diff --git a/required/tools/testfiles/tlb4159.tlg b/required/tools/testfiles/tlb4159.tlg index 141fc57e7..2c5a62c69 100644 --- a/required/tools/testfiles/tlb4159.tlg +++ b/required/tools/testfiles/tlb4159.tlg @@ -163,7 +163,7 @@ Completed box being shipped out [1] ...\write1{\@writefile{toc}{\protect \contentsline {subsection}{\protect \numberline {1.1}Definitions}{\thepage }{}\protected@file@percent }} ...\penalty 10000 ...\glue 6.45831 plus 0.86108 -...\write1{\newlabel{sec-def}{{1.1}{\thepage }}} +...\write1{\newlabel{sec-def}{{1.1}{\thepage }{}{}{}}} ...\penalty 10000 ...\penalty 10000 ...\glue(\parskip) 0.0 plus 1.0 @@ -230,7 +230,7 @@ Completed box being shipped out [1] ...\penalty 10000 ...\penalty 10000 ...\glue 6.45831 plus 0.86108 -...\write1{\newlabel{subsec-parity}{{1.1.2}{\thepage }}} +...\write1{\newlabel{subsec-parity}{{1.1.2}{\thepage }{}{}{}}} ...\penalty 10000 ...\penalty 10000 ...\glue -1.94444 diff --git a/required/tools/testfiles/tlb4173.luatex.tlg b/required/tools/testfiles/tlb4173.luatex.tlg index b2f53d799..b520f6d6d 100644 --- a/required/tools/testfiles/tlb4173.luatex.tlg +++ b/required/tools/testfiles/tlb4173.luatex.tlg @@ -14,7 +14,7 @@ Completed box being shipped out [2] ..\glue(\lineskip) 0.0 ..\vbox(550.0+0.0)x345.0, glue set 328.9927fil, direction TLT ...\write-{} -...\write1{\newlabel{T:1}{{1}{\thepage }}} +...\write1{\newlabel{T:1}{{1}{\thepage }{}{}{}}} ...\glue(\topskip) 3.05556 ...\hbox(6.94444+1.94444)x345.0, glue set 159.81227fil, direction TLT ....\localpar @@ -157,7 +157,7 @@ Completed box being shipped out [2] ...\penalty -51 ...\glue 1.94444 ...\glue 10.0 plus 3.0 minus 5.0 -...\write1{\newlabel{T:2}{{2}{\thepage }}} +...\write1{\newlabel{T:2}{{2}{\thepage }{}{}{}}} ...\glue(\parskip) 0.0 plus 1.0 ...\glue(\parskip) 0.0 ...\glue(\baselineskip) 2.55556 @@ -454,7 +454,7 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 ...\penalty -51 ...\glue 10.0 plus 4.0 minus 5.0 -...\write1{\newlabel{T:3}{{3}{\thepage }}} +...\write1{\newlabel{T:3}{{3}{\thepage }{}{}{}}} ...\glue(\parskip) 0.0 plus 1.0 ...\glue(\parskip) 0.0 ...\glue(\baselineskip) 4.5 diff --git a/required/tools/testfiles/tlb4173.tlg b/required/tools/testfiles/tlb4173.tlg index 86b3c3304..07f11fc38 100644 --- a/required/tools/testfiles/tlb4173.tlg +++ b/required/tools/testfiles/tlb4173.tlg @@ -14,7 +14,7 @@ Completed box being shipped out [2] ..\glue(\lineskip) 0.0 ..\vbox(550.0+0.0)x345.0, glue set 328.9927fil ...\write-{} -...\write1{\newlabel{T:1}{{1}{\thepage }}} +...\write1{\newlabel{T:1}{{1}{\thepage }{}{}{}}} ...\glue(\topskip) 3.05556 ...\hbox(6.94444+1.94444)x345.0, glue set 159.81227fil ....\hbox(6.94444+0.0)x59.58307 @@ -133,7 +133,7 @@ Completed box being shipped out [2] ...\penalty -51 ...\glue 1.94444 ...\glue 10.0 plus 3.0 minus 5.0 -...\write1{\newlabel{T:2}{{2}{\thepage }}} +...\write1{\newlabel{T:2}{{2}{\thepage }{}{}{}}} ...\glue(\parskip) 0.0 plus 1.0 ...\glue(\parskip) 0.0 ...\glue(\baselineskip) 2.55556 @@ -384,7 +384,7 @@ Completed box being shipped out [2] ....\glue(\rightskip) 0.0 ...\penalty -51 ...\glue 10.0 plus 4.0 minus 5.0 -...\write1{\newlabel{T:3}{{3}{\thepage }}} +...\write1{\newlabel{T:3}{{3}{\thepage }{}{}{}}} ...\glue(\parskip) 0.0 plus 1.0 ...\glue(\parskip) 0.0 ...\glue(\baselineskip) 4.5