[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Gh955 fix broken rollback (#957) (7dab30fd)
GitHub
noreply at github.com
Thu Nov 17 15:01:30 CET 2022
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/7dab30fd37eaa0868b120dce848ce93b81772ff2
>---------------------------------------------------------------
commit 7dab30fd37eaa0868b120dce848ce93b81772ff2
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Nov 17 15:01:30 2022 +0100
Gh955 fix broken rollback (#957)
* correction for #955
* change next release date to 2023-06-01
* dummy test for release 2023-06-01
* restore error message after rollback (and test it)
>---------------------------------------------------------------
7dab30fd37eaa0868b120dce848ce93b81772ff2
base/README.md | 2 +-
base/changes.txt | 5 +++
base/latexrelease.dtx | 11 +++++-
base/ltvers.dtx | 2 +-
...tlb-latexrelease-rollback-2022-06-01.luatex.tlg | 43 ++++++++--------------
.../tlb-latexrelease-rollback-2022-06-01.lvt | 5 +++
.../tlb-latexrelease-rollback-2022-06-01.tlg | 43 ++++++++--------------
.../tlb-latexrelease-rollback-2022-06-01.xetex.tlg | 43 ++++++++--------------
...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 --------------
...vt => tlb-latexrelease-rollback-2023-06-01.lvt} | 2 +-
...lg => tlb-latexrelease-rollback-2023-06-01.tlg} | 2 +
base/update-rollback-tests.sh | 1 +
14 files changed, 73 insertions(+), 167 deletions(-)
diff --git a/base/README.md b/base/README.md
index 8fb5e8e8..de00ef06 100644
--- a/base/README.md
+++ b/base/README.md
@@ -1,7 +1,7 @@
The LaTeX kernel
================
-Release 2023-05-01 pre-release 0
+Release 2023-06-01 pre-release 0
Overview
--------
diff --git a/base/changes.txt b/base/changes.txt
index 1ddeed47..efa9239e 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -17,6 +17,11 @@ All changes above are only part of the development branch for the next release.
Introduce key 'nowarn' on filecontents (gh/958)
Do not show "current dir" in message (gh/917)
+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..132a2548 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}
@@ -799,9 +803,12 @@ of this package available from CTAN}
\tl_clear:N \l_@@_restores_tl
% \end{macrocode}
%
-% And restore the hook error message.
+% And restore the silenced error messages.
+% \changes{v1.0p}{2022/11/14}
+% {Unsilence \cs{NewMarkClass} error message after rollback (gh/955)}
% \begin{macrocode}
\msg_redirect_name:nnn { hooks } { exists } { }
+\msg_redirect_name:nnn { mark } { class-already-defined } { }
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/base/ltvers.dtx b/base/ltvers.dtx
index 2aa3dd6e..c30609cb 100644
--- a/base/ltvers.dtx
+++ b/base/ltvers.dtx
@@ -112,7 +112,7 @@
%</2ekernel>
%<latexrelease>\edef\latexreleaseversion
%<*2ekernel|latexrelease>
- {2023-05-01}
+ {2023-06-01}
%</2ekernel|latexrelease>
%<*2ekernel>
\def\patch at level{-0}
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..7e0295c3 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 ....
@@ -768,3 +741,19 @@ Already applied: [....-..-..] Preload glyphtounicode on input line ....
Applying: [....-..-..] UTF-8 default on input line ....
Already applied: [....-..-..] UTF-8 default on input line ....
)
+test if errors are restored:
+! LaTeX hooks Error: Hook 'begindocument' has already been declared.
+For immediate help type H <return>.
+ ...
+l. ...\NewHook {begindocument}
+There already exists a hook declaration with this name.
+Please use a different name for your hook.
+! 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.
diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.lvt b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.lvt
index e8a27b2b..b6d605de 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.lvt
+++ b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.lvt
@@ -8,5 +8,10 @@
\RequirePackage[2022/06/01]{latexrelease}
+\typeout{test if errors are restored:}
+
+\NewHook {begindocument}
+\NewMarkClass {2e-right}
+
\END
diff --git a/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg b/base/testfiles/tlb-latexrelease-rollback-2022-06-01.tlg
index ecdfd27e..72c9e78d 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 ....
@@ -1192,3 +1165,19 @@ Now handling font encoding U ...
)
Already applied: [....-..-..] UTF-8 default on input line ....
)
+test if errors are restored:
+! LaTeX hooks Error: Hook 'begindocument' has already been declared.
+For immediate help type H <return>.
+ ...
+l. ...\NewHook {begindocument}
+There already exists a hook declaration with this name.
+Please use a different name for your hook.
+! 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.
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..93af95f8 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 ....
@@ -763,3 +736,19 @@ Already applied: [....-..-..] Preload glyphtounicode on input line ....
Applying: [....-..-..] UTF-8 default on input line ....
Already applied: [....-..-..] UTF-8 default on input line ....
)
+test if errors are restored:
+! LaTeX hooks Error: Hook 'begindocument' has already been declared.
+For immediate help type H <return>.
+ ...
+l. ...\NewHook {begindocument}
+There already exists a hook declaration with this name.
+Please use a different name for your hook.
+! 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.
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 ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.lvt b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.lvt
similarity index 78%
copy from base/testfiles/tlb-latexrelease-rollback-2021-06-01.lvt
copy to base/testfiles/tlb-latexrelease-rollback-2023-06-01.lvt
index d89f90db..ef86b704 100644
--- a/base/testfiles/tlb-latexrelease-rollback-2021-06-01.lvt
+++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.lvt
@@ -6,7 +6,7 @@
\START
-\RequirePackage[2021/06/01]{latexrelease}
+\RequirePackage[2023/06/01]{latexrelease}
\END
diff --git a/base/testfiles/tlb-latexrelease-rollback-002.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg
similarity index 61%
copy from base/testfiles/tlb-latexrelease-rollback-002.luatex.tlg
copy to base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg
index 4797c8ed..44411474 100644
--- a/base/testfiles/tlb-latexrelease-rollback-002.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-2023-06-01.tlg
@@ -1,5 +1,7 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
(latexrelease.sty
+LaTeX Info: Redefining \IfTargetDateBefore on input line ....
Package: latexrelease ....-..-.. v... LaTeX release emulation and tests (including releases up to ....-..-..)
+Package latexrelease Warning: Current format date selected, no patches applied.
)
diff --git a/base/update-rollback-tests.sh b/base/update-rollback-tests.sh
index 9b8156b2..d584f270 100755
--- a/base/update-rollback-tests.sh
+++ b/base/update-rollback-tests.sh
@@ -4,6 +4,7 @@ l3build save -eetex,xetex,luatex \
tlb-latexrelease-rollback-2021-11-15 \
tlb-latexrelease-rollback-2022-06-01 \
tlb-latexrelease-rollback-2022-11-01 \
+ tlb-latexrelease-rollback-2023-06-01 \
tlb-latexrelease-rollback-003-often \
tlb-rollback-004-often \
tlb-rollback-005 \
More information about the latex3-commits
mailing list.