[latex3-commits] [git/LaTeX3-latex3-latex2e] gh955: correction for #955 (1c846879)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Nov 14 16:13:08 CET 2022
Repository : https://github.com/latex3/latex2e
On branch : gh955
Link : https://github.com/latex3/latex2e/commit/1c846879de36423b615030be02c5ed0ad30de930
>---------------------------------------------------------------
commit 1c846879de36423b615030be02c5ed0ad30de930
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Nov 14 16:13:08 2022 +0100
correction for #955
>---------------------------------------------------------------
1c846879de36423b615030be02c5ed0ad30de930
base/changes.txt | 5 ++++
base/latexrelease.dtx | 6 ++++-
...tlb-latexrelease-rollback-2022-06-01.luatex.tlg | 27 ----------------------
.../tlb-latexrelease-rollback-2022-06-01.tlg | 27 ----------------------
.../tlb-latexrelease-rollback-2022-06-01.xetex.tlg | 27 ----------------------
...tlb-latexrelease-rollback-2022-11-01.luatex.tlg | 27 ----------------------
.../tlb-latexrelease-rollback-2022-11-01.tlg | 27 ----------------------
.../tlb-latexrelease-rollback-2022-11-01.xetex.tlg | 27 ----------------------
8 files changed, 10 insertions(+), 163 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 10dd3636..0d2cae4e 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -11,6 +11,11 @@ All changes above are only part of the development branch for the next release.
================================================================================
+2022-11-14 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * latexrelease.dtx (subsection{Ignoring \texttt{\string_new} errors when rolling back}):
+ Silence \cs{NewMarkClass} in rollback (gh/955)
+
2022-11-13 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* doc.dtx:
diff --git a/base/latexrelease.dtx b/base/latexrelease.dtx
index 29400755..d614e421 100644
--- a/base/latexrelease.dtx
+++ b/base/latexrelease.dtx
@@ -40,7 +40,7 @@
%<*latexrelease>
% \fi
% \ProvidesFile{latexrelease.dtx}
- [2022/02/28 v1.0o LaTeX release emulation and tests
+ [2022/11/14 v1.0p LaTeX release emulation and tests
(including releases up to \latexreleaseversion)]
% \iffalse
%</latexrelease>
@@ -746,8 +746,12 @@ of this package available from CTAN}
%
% Finally, redirect the error thrown by \cs{NewHook} to nowhere so it
% can be safely reused (the hook isn't redeclared if it already exists).
+% The same happens for \cs{NewMarkClass}.
+% \changes{v1.0p}{2022/11/14}
+% {Silence \cs{NewMarkClass} in rollback (gh/955)}
% \begin{macrocode}
\msg_redirect_name:nnn { hooks } { exists } { none }
+\msg_redirect_name:nnn { mark } { class-already-defined }{ none }
% \end{macrocode}
%
% Now a one-off for |ltcmd.dtx|: we need to make \cs{NewDocumentCommand}
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 ac4634f3..f5c31a4f 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.luatex.tlg
@@ -722,33 +722,6 @@ Already applied: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Delayed legacy marks on input line ....
-! LaTeX mark Error: Mark class '2e-left' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-left}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-left': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right-nonempty' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right-nonempty}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right-nonempty': this
-mark class already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
Already applied: [....-..-..] Delayed legacy marks on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation 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 ecdfd27e..3b531ebb 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg
@@ -710,33 +710,6 @@ Already applied: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Delayed legacy marks on input line ....
-! LaTeX mark Error: Mark class '2e-left' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-left}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-left': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right-nonempty' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right-nonempty}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right-nonempty': this
-mark class already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
Already applied: [....-..-..] Delayed legacy marks on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation 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 d29cff18..157621bd 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.xetex.tlg
@@ -711,33 +711,6 @@ Already applied: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Delayed legacy marks on input line ....
-! LaTeX mark Error: Mark class '2e-left' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-left}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-left': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right-nonempty' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right-nonempty}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right-nonempty': this
-mark class already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
Already applied: [....-..-..] Delayed legacy marks on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation 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 b9427f3a..595b9963 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.luatex.tlg
@@ -722,33 +722,6 @@ Already applied: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Delayed legacy marks on input line ....
-! LaTeX mark Error: Mark class '2e-left' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-left}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-left': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right-nonempty' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right-nonempty}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right-nonempty': this
-mark class already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
Already applied: [....-..-..] Delayed legacy marks on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation 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 7bbcefe9..62f38201 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.tlg
@@ -710,33 +710,6 @@ Already applied: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Delayed legacy marks on input line ....
-! LaTeX mark Error: Mark class '2e-left' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-left}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-left': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right-nonempty' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right-nonempty}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right-nonempty': this
-mark class already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
Already applied: [....-..-..] Delayed legacy marks on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation 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 ab8b3fee..58a4d1cb 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-2022-11-01.xetex.tlg
@@ -711,33 +711,6 @@ Already applied: [....-..-..] NFSS version1 commands on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
Applying: [....-..-..] Delayed legacy marks on input line ....
-! LaTeX mark Error: Mark class '2e-left' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-left}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-left': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right': this mark class
-already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
-! LaTeX mark Error: Mark class '2e-right-nonempty' already defined
-For immediate help type H <return>.
- ...
-l. ...\NewMarkClass {2e-right-nonempty}
-This is a coding error.
-LaTeX was asked to define a new mark class called '2e-right-nonempty': this
-mark class already exists.
-Try typing <return> to proceed.
-If that doesn't work, type X <return> to quit.
Already applied: [....-..-..] Delayed legacy marks on input line ....
Applying: [....-..-..] Extended Allocation on input line ....
Already applied: [....-..-..] Extended Allocation on input line ....
More information about the latex3-commits
mailing list.