[latex3-commits] [git/LaTeX3-latex3-latex2e] hotfix/gh423: fix for #423 (2ca263ee)
Frank Mittelbach
frank.mittelbach at latex-project.org
Mon Nov 9 13:18:13 CET 2020
Repository : https://github.com/latex3/latex2e
On branch : hotfix/gh423
Link : https://github.com/latex3/latex2e/commit/2ca263eece615693c6ad994750182ba0ff91b877
>---------------------------------------------------------------
commit 2ca263eece615693c6ad994750182ba0ff91b877
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Mon Nov 9 13:18:13 2020 +0100
fix for #423
>---------------------------------------------------------------
2ca263eece615693c6ad994750182ba0ff91b877
base/changes.txt | 13 +++++++++++++
base/ltclass.dtx | 11 ++++++-----
base/ltmath.dtx | 9 ++++++++-
required/amsmath/testfiles/github-0423.lvt | 17 +++++++++++++++++
.../amsmath/testfiles/github-0423.tlg | 2 +-
.../amsmath/testfiles/github-0423.xetex.tlg | 3 ++-
6 files changed, 47 insertions(+), 8 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 29f3d293..93bedd14 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -10,6 +10,19 @@ are not part of the distribution.
All changes above are only part of the development branch for the next release.
================================================================================
+2020-11-09 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltmath.dtx:
+ \negmedspace and \negthickspace have been only in amsmath,
+ so we need to undefine for rollback because amsmath used
+ \newcommand back then (gh/423)
+
+2020-11-09 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltclass.dtx (section{Package/class rollback mechanism}):
+ Change help text for suspicous rollback, because the package may have
+ existed then --- there is just no rollback data (gh/423)
+
#########################
# 2020-10-01 PL 2 Release
#########################
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index b639ae94..57f76012 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2020/10/18 v1.3t LaTeX Kernel (Class & Package Interface)]
+ [2020/11/09 v1.3u LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -3271,19 +3271,20 @@
% A similar error is given if global rollback date and min-date on
% a specific package conflict with each other, but that case is
% happens only once so it is inlined.
+% \changes{v1.3u}{2020/11/09}{Change help text because the package may have
+% existed then --- there is just no rollback data (gh/423).}
% \begin{macrocode}
\def\pkgcls at rollbackdate@error#1{%
\@latex at error{Suspicious rollback date given}%
- {The \@cls at pkg\space'\@currname' claims that it
- came into existence on #1 which\MessageBreak
+ {The \@cls at pkg\space'\@currname' has no rollback data
+ before #1 which\MessageBreak
is after your requested rollback date --- so
- something is wrong here.\MessageBreak
+ something may be wrong here.\MessageBreak
Continue and we use the earliest known release.}}
% \end{macrocode}
% \end{macro}
%
%
-%
% \begin{macro}{\DeclareCurrentRelease}
% This declares the date (and possible name) of the current version
% of a package or class.
diff --git a/base/ltmath.dtx b/base/ltmath.dtx
index 36b8bb7e..770367c8 100644
--- a/base/ltmath.dtx
+++ b/base/ltmath.dtx
@@ -38,7 +38,7 @@
%<*driver>
% \fi
\ProvidesFile{ltmath.dtx}
- [2020/07/27 v1.2g LaTeX Kernel (Math Setup)]
+ [2020/11/09 v1.2h LaTeX Kernel (Math Setup)]
% \iffalse
%</driver>
%
@@ -593,6 +593,13 @@
%<latexrelease>\def\;{\mskip\thickmuskip}
%<latexrelease>\def\!{\mskip-\thinmuskip}
%<latexrelease>
+% \end{macrocode}
+% \changes{v1.2h}{2020/11/09}{\cs{negmedspace} and \cs{negthickspace}
+% have been only in amsmath, so we need to undefine for rollback (gh/423)}
+% \begin{macrocode}
+%<latexrelease>\let\negmedspace\@undefined
+%<latexrelease>\let\negthickspace\@undefined
+%<latexrelease>
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
diff --git a/required/amsmath/testfiles/github-0423.lvt b/required/amsmath/testfiles/github-0423.lvt
new file mode 100644
index 00000000..b7e88e2b
--- /dev/null
+++ b/required/amsmath/testfiles/github-0423.lvt
@@ -0,0 +1,17 @@
+% rollback did fail because amsmath used \newcommand :-(
+
+\RequirePackage[2018/11/01]{latexrelease}
+
+\documentclass{article}
+
+\usepackage{amsmath}
+
+\input{test2e}
+
+\START
+
+\begin{document}
+
+
+\END
+
diff --git a/base/testfiles/tlb0613.tlg b/required/amsmath/testfiles/github-0423.tlg
similarity index 98%
copy from base/testfiles/tlb0613.tlg
copy to required/amsmath/testfiles/github-0423.tlg
index 730985ca..8691121d 100644
--- a/base/testfiles/tlb0613.tlg
+++ b/required/amsmath/testfiles/github-0423.tlg
@@ -1,6 +1,6 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-(tlb0613.aux)
+(github-0423.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 ....
diff --git a/base/testfiles/tlb0613.tlg b/required/amsmath/testfiles/github-0423.xetex.tlg
similarity index 90%
copy from base/testfiles/tlb0613.tlg
copy to required/amsmath/testfiles/github-0423.xetex.tlg
index 730985ca..cfac893a 100644
--- a/base/testfiles/tlb0613.tlg
+++ b/required/amsmath/testfiles/github-0423.xetex.tlg
@@ -1,6 +1,6 @@
This is a generated file for the LaTeX2e validation system.
Don't change this file in any respect.
-(tlb0613.aux)
+(github-0423.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 ....
@@ -15,3 +15,4 @@ 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 ....
+LaTeX Font Info: Trying to load font information for TU+lmr on input line ....
More information about the latex3-commits
mailing list.