[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Fixcontentsline (#370) (2ef798be)
GitHub
noreply at github.com
Sat Aug 15 12:42:15 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/2ef798bee3511cff40b09ce26f0fcf98cb731e56
>---------------------------------------------------------------
commit 2ef798bee3511cff40b09ce26f0fcf98cb731e56
Author: Ulrike Fischer <news3 at nililand.de>
Date: Sat Aug 15 12:42:15 2020 +0200
Fixcontentsline (#370)
* add fourth argument to contentsline
* Correct typo
* adapt date
* resave tests
* repair test
* correct cs in ltnews
* [ci skip] correct ltnews text
Co-authored-by: Ulrike Fischer <fischer at troubleshooting-tex.de>
>---------------------------------------------------------------
2ef798bee3511cff40b09ce26f0fcf98cb731e56
base/changes.txt | 4 ++
base/doc/ltnews31.tex | 4 +-
base/doc/ltnews32.tex | 15 +++++-
base/ltsect.dtx | 21 +++++++--
base/testfiles/github-0073.luatex.tlg | 54 +++++++++++-----------
base/testfiles/github-0073.tlg | 36 +++++++--------
base/testfiles/tl2e2.luatex.tlg | 2 +-
base/testfiles/tl2e2.tlg | 2 +-
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 2 +
.../tlb-latexrelease-rollback-003-often.tlg | 2 +
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 2 +
base/testfiles/tlb-rollback-004-often.luatex.tlg | 1 +
base/testfiles/tlb-rollback-004-often.tlg | 1 +
base/testfiles/tlb-rollback-004-often.xetex.tlg | 1 +
base/testfiles/tlb1378.luatex.tlg | 4 +-
base/testfiles/tlb4182.tlg | 2 +-
base/testfiles/tltc001.luatex.tlg | 2 +-
base/testfiles/tltc001.tlg | 2 +-
base/testfiles/tltx001.luatex.tlg | 2 +-
base/testfiles/tltx001.tlg | 2 +-
base/testfiles/tltx001.xetex.tlg | 2 +-
base/testfiles/tnfss2.luatex.tlg | 2 +-
base/testfiles/tnfss2.tlg | 2 +-
base/testfiles/vlatex03-2015.luatex.tlg | 2 +-
base/testfiles/vlatex03-2015.tlg | 2 +-
base/testfiles/vtl2e03-2015.luatex.tlg | 2 +-
base/testfiles/vtl2e03-2015.tlg | 2 +-
27 files changed, 107 insertions(+), 68 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 19f8e5ab..bd83d579 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.
================================================================================
+2020-07-28 Ulrike Fischer <Ulrike.Fischer at latex-project.org>
+
+ * ltsect.dtx:
+ added fourth argument to \contentsline in \addcontentsline
2020-08-10 Marcel Krüger <Marcel.Krueger at latex-project.org>
diff --git a/base/doc/ltnews31.tex b/base/doc/ltnews31.tex
index 83e81cb7..1b775a53 100644
--- a/base/doc/ltnews31.tex
+++ b/base/doc/ltnews31.tex
@@ -547,10 +547,10 @@ This was corrected.
\enlargethispage{-\smallskipamount}
\vspace{-\medskipamount}
-\subsection{Ensure that \cs{\textbackslash} remains robust}
+\subsection{Ensure that \cs{textbackslash} remains robust}
In the last release we made most document-level commands robust, but
-\cs{\textbackslash} became fragile again\\
+\cs{textbackslash} became fragile again\\
whenever \cs{raggedright} or similar typesetting\\
was used. This has been fixed.
%
diff --git a/base/doc/ltnews32.tex b/base/doc/ltnews32.tex
index 16884862..2c9ce244 100644
--- a/base/doc/ltnews32.tex
+++ b/base/doc/ltnews32.tex
@@ -288,7 +288,7 @@ corrected.
\subsection{Support \pkg{calc} in various kernel commands}
-The \cs{hspace}, \cs{vspace}, \cs{addvspace}, \cs{\textbackslash} and
+The \cs{hspace}, \cs{vspace}, \cs{addvspace}, \cs{textbackslash} and
other commands simply passed their argument to a \TeX{} primitive to
produce the necessary space. As a result it was impossible to specify
anything other than a simple dimension value in such arguments. This
@@ -594,6 +594,17 @@ protected glyph node which is not affected by font shaping.
%
\githubissue{165}
+
+\subsection{Added a fourth empty argument to \cs{contentsline}}
+
+\LaTeX's writes with \cs{addcontentsline} a \cs{contentsline}
+command with three arguments to the toc and similar files.
+\pkg{hyperref} redefines \cs{addcontentsline} to write
+a fourth argument. The change unifies the number of arguments
+by writing an additional empty brace group.
+
+
+
\subsection{Lua\TeX\ callback \texttt{new\_graf} made \texttt{exclusive}}
Corrected an incorrect callback type which caused return values from the
@@ -606,6 +617,8 @@ paragraph indentation.
+
+
\section{Changes to packages in the \pkg{graphics} category}
\subsection{Generate a warning if existing color definition is changed}
diff --git a/base/ltsect.dtx b/base/ltsect.dtx
index 9f379ea2..359b445f 100644
--- a/base/ltsect.dtx
+++ b/base/ltsect.dtx
@@ -778,20 +778,33 @@
% \cs{addcontentsline}. ASAJ.}
% \changes{v1.1c}{2018/09/26}{Sometimes mask the endline char when
% writing to files (github/73)}
+% \changes{v1.1e}{2020/10/01}{add a fourth argument for better
+% hyperref compability}
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease> {\addcontentsline}{fourth argument}%
+\def\addcontentsline#1#2#3{%
+% \end{macrocode}
+% We add an empty brace pair at the end of \cs{contentsline}
+% so that the number of argument is identical in documents
+% with and without hyperref.
+% \begin{macrocode}
+ \addtocontents{#1}{\protect\contentsline{#2}{#3}{\thepage}{}%
+ \protected at file@percent}}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{2018/12/01}%
%<latexrelease> {\addcontentsline}{Mask line endings}%
-\def\addcontentsline#1#2#3{%
- \addtocontents{#1}{\protect\contentsline{#2}{#3}{\thepage}%
+%<latexrelease> \def\addcontentsline#1#2#3{%
+%<latexrelease> \addtocontents{#1}{\protect\contentsline{#2}{#3}{\thepage}%
% \end{macrocode}
% We add \cs{protected at file@percent} at the end which is turned inside
% \cs{@writefile} into a percent character to mask the newline after
% the closing argument brace.
% \begin{macrocode}
- \protected at file@percent}}
-%</2ekernel|latexrelease>
+%<latexrelease> \protected at file@percent}}
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
%<latexrelease> {\addcontentsline}{Mask line endings}%
diff --git a/base/testfiles/github-0073.luatex.tlg b/base/testfiles/github-0073.luatex.tlg
index c46f2d54..c754697f 100644
--- a/base/testfiles/github-0073.luatex.tlg
+++ b/base/testfiles/github-0073.luatex.tlg
@@ -3,39 +3,39 @@ Don't change this file in any respect.
-------- github-0073.aux (start) ---------
(github-0073.aux)
\relax^^M
-\@writefile{toc}{\contentsline {section}{\numberline {1}xx}{2}\protected at file@p
-ercent }^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}a}{2}\protected at fi
-le at percent }^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}a}{2}\protected at fi
-le at percent }^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.1}b}{2}\protect
-ed at file@percent }^^M
+\@writefile{toc}{\contentsline {section}{\numberline {1}xx}{2}{}\protected at file
+ at percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}a}{2}{}\protected@
+file at percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}a}{2}{}\protected@
+file at percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.1}b}{2}{}\prote
+cted at file@percent }^^M
\@writefile{toc}{foo}^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.2}b}{2}\protect
-ed at file@percent }^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.3}b}{3}\protect
-ed at file@percent }^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.4}b}{3}\protect
-ed at file@percent }^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}a}{3}\protected at fi
-le at percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.2}b}{2}{}\prote
+cted at file@percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.3}b}{3}{}\prote
+cted at file@percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.4}b}{3}{}\prote
+cted at file@percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}a}{3}{}\protected@
+file at percent }^^M
\@writefile{toc}{foo bar}^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}a}{3}\protected at fi
-le at percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}a}{3}{}\protected@
+file at percent }^^M
\gdef \@abspage at last{3}^^M
-------- github-0073.aux (end) -----------
-------- github-0073.toc (start) ---------
(github-0073.toc)
-\contentsline {section}{\numberline {1}xx}{2}%^^M
-\contentsline {subsection}{\numberline {1.1}a}{2}%^^M
-\contentsline {subsection}{\numberline {1.2}a}{2}%^^M
-\contentsline {subsubsection}{\numberline {1.2.1}b}{2}%^^M
+\contentsline {section}{\numberline {1}xx}{2}{}%^^M
+\contentsline {subsection}{\numberline {1.1}a}{2}{}%^^M
+\contentsline {subsection}{\numberline {1.2}a}{2}{}%^^M
+\contentsline {subsubsection}{\numberline {1.2.1}b}{2}{}%^^M
foo^^M
-\contentsline {subsubsection}{\numberline {1.2.2}b}{2}%^^M
-\contentsline {subsubsection}{\numberline {1.2.3}b}{3}%^^M
-\contentsline {subsubsection}{\numberline {1.2.4}b}{3}%^^M
-\contentsline {subsection}{\numberline {1.3}a}{3}%^^M
+\contentsline {subsubsection}{\numberline {1.2.2}b}{2}{}%^^M
+\contentsline {subsubsection}{\numberline {1.2.3}b}{3}{}%^^M
+\contentsline {subsubsection}{\numberline {1.2.4}b}{3}{}%^^M
+\contentsline {subsection}{\numberline {1.3}a}{3}{}%^^M
foo bar^^M
-\contentsline {subsection}{\numberline {1.4}a}{3}%^^M
+\contentsline {subsection}{\numberline {1.4}a}{3}{}%^^M
-------- github-0073.toc (end) -----------
diff --git a/base/testfiles/github-0073.tlg b/base/testfiles/github-0073.tlg
index fac630ba..a4004b3a 100644
--- a/base/testfiles/github-0073.tlg
+++ b/base/testfiles/github-0073.tlg
@@ -3,30 +3,30 @@ Don't change this file in any respect.
-------- github-0073.aux (start) ---------
(github-0073.aux)
\relax^^M
-\@writefile{toc}{\contentsline {section}{\numberline {1}xx}{2}\protected at file@percent }^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}a}{2}\protected at file@percent }^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}a}{2}\protected at file@percent }^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.1}b}{2}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {section}{\numberline {1}xx}{2}{}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}a}{2}{}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}a}{2}{}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.1}b}{2}{}\protected at file@percent }^^M
\@writefile{toc}{foo}^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.2}b}{2}\protected at file@percent }^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.3}b}{3}\protected at file@percent }^^M
-\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.4}b}{3}\protected at file@percent }^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}a}{3}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.2}b}{2}{}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.3}b}{3}{}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsubsection}{\numberline {1.2.4}b}{3}{}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.3}a}{3}{}\protected at file@percent }^^M
\@writefile{toc}{foo bar}^^M
-\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}a}{3}\protected at file@percent }^^M
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.4}a}{3}{}\protected at file@percent }^^M
\gdef \@abspage at last{3}^^M
-------- github-0073.aux (end) -----------
-------- github-0073.toc (start) ---------
(github-0073.toc)
-\contentsline {section}{\numberline {1}xx}{2}%^^M
-\contentsline {subsection}{\numberline {1.1}a}{2}%^^M
-\contentsline {subsection}{\numberline {1.2}a}{2}%^^M
-\contentsline {subsubsection}{\numberline {1.2.1}b}{2}%^^M
+\contentsline {section}{\numberline {1}xx}{2}{}%^^M
+\contentsline {subsection}{\numberline {1.1}a}{2}{}%^^M
+\contentsline {subsection}{\numberline {1.2}a}{2}{}%^^M
+\contentsline {subsubsection}{\numberline {1.2.1}b}{2}{}%^^M
foo^^M
-\contentsline {subsubsection}{\numberline {1.2.2}b}{2}%^^M
-\contentsline {subsubsection}{\numberline {1.2.3}b}{3}%^^M
-\contentsline {subsubsection}{\numberline {1.2.4}b}{3}%^^M
-\contentsline {subsection}{\numberline {1.3}a}{3}%^^M
+\contentsline {subsubsection}{\numberline {1.2.2}b}{2}{}%^^M
+\contentsline {subsubsection}{\numberline {1.2.3}b}{3}{}%^^M
+\contentsline {subsubsection}{\numberline {1.2.4}b}{3}{}%^^M
+\contentsline {subsection}{\numberline {1.3}a}{3}{}%^^M
foo bar^^M
-\contentsline {subsection}{\numberline {1.4}a}{3}%^^M
+\contentsline {subsection}{\numberline {1.4}a}{3}{}%^^M
-------- github-0073.toc (end) -----------
diff --git a/base/testfiles/tl2e2.luatex.tlg b/base/testfiles/tl2e2.luatex.tlg
index d1c02622..f4d18e31 100644
--- a/base/testfiles/tl2e2.luatex.tlg
+++ b/base/testfiles/tl2e2.luatex.tlg
@@ -215,7 +215,7 @@ Completed box being shipped out [2]
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage
-}\protected at file@percent \ETC.}
+}{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/sl/10 s
....\OT1/cmr/m/sl/10 l
diff --git a/base/testfiles/tl2e2.tlg b/base/testfiles/tl2e2.tlg
index c1aa5ffd..725ca524 100644
--- a/base/testfiles/tl2e2.tlg
+++ b/base/testfiles/tl2e2.tlg
@@ -177,7 +177,7 @@ Completed box being shipped out [2]
....\OT1/cmr/bx/n/10 e
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
-....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }\protected at file@percent \ETC.}
+....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/sl/10 s
....\OT1/cmr/m/sl/10 l
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 8f3e088d..70033798 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -70,6 +70,7 @@ Skipping: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Skipping: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Skipping: [....-..-..] Prevent protrusion on input line ....
@@ -430,6 +431,7 @@ LaTeX Info: Redefining \date on input line ....
LaTeX Info: Redefining \thanks on input line ....
LaTeX Info: Redefining \and on input line ....
Already applied: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 7479c853..a9ba9c64 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -68,6 +68,7 @@ Skipping: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Skipping: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Skipping: [....-..-..] Prevent protrusion on input line ....
@@ -422,6 +423,7 @@ LaTeX Info: Redefining \date on input line ....
LaTeX Info: Redefining \thanks on input line ....
LaTeX Info: Redefining \and on input line ....
Already applied: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Prevent protrusion 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 3b744816..f03e466e 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -68,6 +68,7 @@ Skipping: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] Make commands robust on input line ....
Skipping: [....-..-..] Make commands robust on input line ....
Applying: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Skipping: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Skipping: [....-..-..] Prevent protrusion on input line ....
@@ -431,6 +432,7 @@ LaTeX Info: Redefining \date on input line ....
LaTeX Info: Redefining \thanks on input line ....
LaTeX Info: Redefining \and on input line ....
Already applied: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index de37dbd1..abfd09af 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -121,6 +121,7 @@ LaTeX Info: Redefining \date on input line ....
LaTeX Info: Redefining \thanks on input line ....
LaTeX Info: Redefining \and on input line ....
Already applied: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index c59bb27a..3e20b694 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -119,6 +119,7 @@ LaTeX Info: Redefining \date on input line ....
LaTeX Info: Redefining \thanks on input line ....
LaTeX Info: Redefining \and on input line ....
Already applied: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index fb5d8e62..6cd418e6 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -119,6 +119,7 @@ LaTeX Info: Redefining \date on input line ....
LaTeX Info: Redefining \thanks on input line ....
LaTeX Info: Redefining \and on input line ....
Already applied: [....-..-..] Make commands robust on input line ....
+Skipping: [....-..-..] fourth argument on input line ....
Applying: [....-..-..] Mask line endings on input line ....
Already applied: [....-..-..] Mask line endings on input line ....
Applying: [....-..-..] Prevent protrusion on input line ....
diff --git a/base/testfiles/tlb1378.luatex.tlg b/base/testfiles/tlb1378.luatex.tlg
index 401912d8..5e4565e3 100644
--- a/base/testfiles/tlb1378.luatex.tlg
+++ b/base/testfiles/tlb1378.luatex.tlg
@@ -26,7 +26,7 @@ Just continue, I'll change it to 0xFFFD.
(tlb1378.toc
! String contains an invalid utf-8 sequence.
l. ...\contentsline {section}{\numberline {1}
- �}{1}%
+ �}{1}{}%
A funny symbol that I can't read has just been (re)read.
Just continue, I'll change it to 0xFFFD.
)
@@ -125,7 +125,7 @@ Missing character: There is no � (U+FFFD) in font cmbx10!
(tlb1378.aux
! String contains an invalid utf-8 sequence.
l. ......{toc}{\contentsline {section}{\numberline {1}
- �}{1}\protected at file@per...
+ �}{1}{}\protected at file@p...
A funny symbol that I can't read has just been (re)read.
Just continue, I'll change it to 0xFFFD.
)
diff --git a/base/testfiles/tlb4182.tlg b/base/testfiles/tlb4182.tlg
index e42fff91..56994de3 100644
--- a/base/testfiles/tlb4182.tlg
+++ b/base/testfiles/tlb4182.tlg
@@ -9,7 +9,7 @@ See the inputenc package documentation for explanation.
Type H <return> for immediate help.
...
l. ......}Watch \@inpenc at undefined@ {ascii} out!}{1}
- %
+ {}%
You need to provide a definition with \DeclareInputText
or \DeclareInputMath before using this key.
)
diff --git a/base/testfiles/tltc001.luatex.tlg b/base/testfiles/tltc001.luatex.tlg
index ca59b4e5..a08f247d 100644
--- a/base/testfiles/tltc001.luatex.tlg
+++ b/base/testfiles/tltc001.luatex.tlg
@@ -101,7 +101,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> ...\csname thesubsection\endcsname }\fi A \SliTeX
- {} logo}{\thepage }\protec...
+ {} logo}{\thepage }{}\prot...
\protected at write ...edef \reserved at a {\write #1{#3
}}\reserved at a \endgroup \i...
\@sect ...erline {\csname the#1\endcsname }\fi #7}
diff --git a/base/testfiles/tltc001.tlg b/base/testfiles/tltc001.tlg
index c12a03aa..6ed112da 100644
--- a/base/testfiles/tltc001.tlg
+++ b/base/testfiles/tltc001.tlg
@@ -101,7 +101,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> ...subsection\endcsname }\fi A \SliTeX
- {} logo}{\thepage }\protec...
+ {} logo}{\thepage }{}\prot...
\protected at write ...edef \reserved at a {\write #1{#3
}}\reserved at a \endgroup \i...
\@sect ...erline {\csname the#1\endcsname }\fi #7}
diff --git a/base/testfiles/tltx001.luatex.tlg b/base/testfiles/tltx001.luatex.tlg
index a56c459f..c5bac3c0 100644
--- a/base/testfiles/tltx001.luatex.tlg
+++ b/base/testfiles/tltx001.luatex.tlg
@@ -74,7 +74,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> ...\csname thesubsection\endcsname }\fi A \SliTeX
- {} logo}{\thepage }\protec...
+ {} logo}{\thepage }{}\prot...
l. ...\subsection{A \SliTeX{} logo}
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
diff --git a/base/testfiles/tltx001.tlg b/base/testfiles/tltx001.tlg
index b253fade..c3f01618 100644
--- a/base/testfiles/tltx001.tlg
+++ b/base/testfiles/tltx001.tlg
@@ -74,7 +74,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> ...subsection\endcsname }\fi A \SliTeX
- {} logo}{\thepage }\protec...
+ {} logo}{\thepage }{}\prot...
l. ...\subsection{A \SliTeX{} logo}
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
diff --git a/base/testfiles/tltx001.xetex.tlg b/base/testfiles/tltx001.xetex.tlg
index 551b106e..3db5e505 100644
--- a/base/testfiles/tltx001.xetex.tlg
+++ b/base/testfiles/tltx001.xetex.tlg
@@ -74,7 +74,7 @@ spelling (e.g., `I\hbox'). Otherwise just continue,
and I'll forget about whatever was undefined.
! Undefined control sequence.
<argument> ...subsection\endcsname }\fi A \SliTeX
- {} logo}{\thepage }\protec...
+ {} logo}{\thepage }{}\prot...
l. ...\subsection{A \SliTeX{} logo}
The control sequence at the end of the top line
of your error message was never \def'ed. If you have
diff --git a/base/testfiles/tnfss2.luatex.tlg b/base/testfiles/tnfss2.luatex.tlg
index 906b1a3f..e9508c06 100644
--- a/base/testfiles/tnfss2.luatex.tlg
+++ b/base/testfiles/tnfss2.luatex.tlg
@@ -199,7 +199,7 @@ Completed box being shipped out [2]
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage
-}\protected at file@percent \ETC.}
+}{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/sl/10 s
....\OT1/cmr/m/sl/10 l
diff --git a/base/testfiles/tnfss2.tlg b/base/testfiles/tnfss2.tlg
index 87ab2ea3..3565ea7a 100644
--- a/base/testfiles/tnfss2.tlg
+++ b/base/testfiles/tnfss2.tlg
@@ -161,7 +161,7 @@ Completed box being shipped out [2]
....\OT1/cmr/bx/n/10 e
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
-....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }\protected at file@percent \ETC.}
+....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/sl/10 s
....\OT1/cmr/m/sl/10 l
diff --git a/base/testfiles/vlatex03-2015.luatex.tlg b/base/testfiles/vlatex03-2015.luatex.tlg
index 8558e82d..a0ad8f0e 100644
--- a/base/testfiles/vlatex03-2015.luatex.tlg
+++ b/base/testfiles/vlatex03-2015.luatex.tlg
@@ -229,7 +229,7 @@ ne \ETC.}
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage
-}\protected at file@percent \ETC.}
+}{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/n/10 P
....\OT1/cmr/m/n/10 l
diff --git a/base/testfiles/vlatex03-2015.tlg b/base/testfiles/vlatex03-2015.tlg
index e6be5453..1f5ea5cc 100644
--- a/base/testfiles/vlatex03-2015.tlg
+++ b/base/testfiles/vlatex03-2015.tlg
@@ -184,7 +184,7 @@ Completed box being shipped out [1]
....\OT1/cmr/bx/n/10 e
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
-....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }\protected at file@percent \ETC.}
+....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/n/10 P
....\OT1/cmr/m/n/10 l
diff --git a/base/testfiles/vtl2e03-2015.luatex.tlg b/base/testfiles/vtl2e03-2015.luatex.tlg
index 1f78a520..301ddc68 100644
--- a/base/testfiles/vtl2e03-2015.luatex.tlg
+++ b/base/testfiles/vtl2e03-2015.luatex.tlg
@@ -227,7 +227,7 @@ ne \ETC.}
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage
-}\protected at file@percent \ETC.}
+}{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/n/10 P
....\OT1/cmr/m/n/10 l
diff --git a/base/testfiles/vtl2e03-2015.tlg b/base/testfiles/vtl2e03-2015.tlg
index b612a8da..b8f12f0d 100644
--- a/base/testfiles/vtl2e03-2015.tlg
+++ b/base/testfiles/vtl2e03-2015.tlg
@@ -182,7 +182,7 @@ Completed box being shipped out [1]
....\OT1/cmr/bx/n/10 e
....\OT1/cmr/bx/n/10 s
....\OT1/cmr/bx/n/10 t
-....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }\protected at file@percent \ETC.}
+....\write1{\@writefile{toc}{\protect \contentsline {paragraph}{Test}{\thepage }{\ETC.}
....\glue 10.00002
....\OT1/cmr/m/n/10 P
....\OT1/cmr/m/n/10 l
More information about the latex3-commits
mailing list.