[latex3-commits] [git/LaTeX3-latex3-latex2e] versioning: added \DeclareNamedRelease updated/fixed test files (f2aab7b)
Frank Mittelbach
frank.mittelbach at latex-project.org
Wed Feb 21 19:43:55 CET 2018
Repository : https://github.com/latex3/latex2e
On branch : versioning
Link : https://github.com/latex3/latex2e/commit/f2aab7bdc96b9aa909b484986160d1a83f7073cb
>---------------------------------------------------------------
commit f2aab7bdc96b9aa909b484986160d1a83f7073cb
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Wed Feb 21 19:43:55 2018 +0100
added \DeclareNamedRelease
updated/fixed test files
>---------------------------------------------------------------
f2aab7bdc96b9aa909b484986160d1a83f7073cb
base/ltclass.dtx | 23 ++++++++
base/testfiles/tlb-rollback-001.lvt | 3 +-
base/testfiles/tlb-rollback-002.lvt | 6 ++
base/testfiles/tlb-rollback-003.luatex.tlg | 82 ++++++++++++++++++++++++++
base/testfiles/tlb-rollback-003.lvt | 20 +++++++
base/testfiles/tlb-rollback-003.tlg | 88 +++++++++++++++++++++++++++-
6 files changed, 218 insertions(+), 4 deletions(-)
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index e9594be..7f19f9b 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -2300,6 +2300,29 @@
% \end{macro}
+% \begin{macro}{\DeclareNamedRelease}}
+% A special version of an ``old'' release: one that can be only
+% selected via a name.
+% \begin{macrocode}
+\providecommand\DeclareNamedRelease[2][beta]{%
+ \ifnum\pkgcls at targetdate=\@ne % named request
+%<*tracerollback>
+ \pkgcls at debug{---DeclareNamedRelease}%
+ \pkgcls at debug{ 1: #1}%
+ \pkgcls at debug{ 2: #2}%
+%</tracerollback>
+ \def\reserved at a{#1}%
+ \ifx\pkgcls at targetlabel\reserved at a
+ \pkgcls at use@this at release{#2}{#1}%
+%<*tracerollback>
+ \else
+ \pkgcls at debug{Label doesn't match}%
+%</tracerollback>
+ \fi
+ \fi
+}
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\DeclareCurrentRelease}
% This declares the date (and possible name) of the current version
diff --git a/base/testfiles/tlb-rollback-001.lvt b/base/testfiles/tlb-rollback-001.lvt
index 8e6c1d6..62cf8ad 100644
--- a/base/testfiles/tlb-rollback-001.lvt
+++ b/base/testfiles/tlb-rollback-001.lvt
@@ -117,7 +117,8 @@
\OMIT
\RequirePackage[2018-12-24]{latexrelease}
-% latex release might have set that back to \@gobble:
+
+% latexrelease might have set that back to \@gobble:
\makeatletter
\let\pkgcls at debug\typeout % more output in the tests
\makeatother
diff --git a/base/testfiles/tlb-rollback-002.lvt b/base/testfiles/tlb-rollback-002.lvt
index 7b31ab2..84add52 100644
--- a/base/testfiles/tlb-rollback-002.lvt
+++ b/base/testfiles/tlb-rollback-002.lvt
@@ -61,6 +61,12 @@
\OMIT
\RequirePackage[2016-01-01]{latexrelease}
+
+% latexrelease might have set that back to \@gobble:
+\makeatletter
+\let\pkgcls at debug\typeout % more output in the tests
+\makeatother
+
\TIMO
%%% TESTS %%%%
diff --git a/base/testfiles/tlb-rollback-003.luatex.tlg b/base/testfiles/tlb-rollback-003.luatex.tlg
index a67cc47..c9668f1 100644
--- a/base/testfiles/tlb-rollback-003.luatex.tlg
+++ b/base/testfiles/tlb-rollback-003.luatex.tlg
@@ -56,6 +56,14 @@ Label doesn't match
2: 2018/10-01
3: testpkg-2018-10-01
Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Label doesn't match
---DeclareCurrentRelease
1: v3
2: 2019-07-01
@@ -94,6 +102,14 @@ Label doesn't match
2: 2018/10-01
3: testpkg-2018-10-01
Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Label doesn't match
---DeclareCurrentRelease
1: v3
2: 2019-07-01
@@ -132,6 +148,14 @@ Label doesn't match
2: 2018/10-01
3: testpkg-2018-10-01
Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Label doesn't match
---DeclareCurrentRelease
1: v3
2: 2019-07-01
@@ -213,3 +237,61 @@ Package: testpkg 2014-01-01 v1.2 test package
-> option dvips executed
This is testpkg 2014-01-01!
))
+--- File loaded request (\usepackage or ...)
+ 1: testpkg
+ 2: dvips
+ 3: =beta
+ 4: sty
+(testpkg.sty
+---\DeclareOldRelease:
+ 1: v1
+ 2: 2014-01-01
+ 3: testpkg-2014-01-01
+Label doesn't match
+---\DeclareOldRelease:
+ 1: v2
+ 2: 2018/10-01
+ 3: testpkg-2018-10-01
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Result: use testpkg-beta
+Rollback for package 'testpkg' requested -> version 'beta'.
+ This corresponds to the release introduced on beta.
+(testpkg-beta.sty
+Package: testpkg 2020-01-01 v4.0 test package
+ -> option dvips executed
+This is testpkg beta 4.0!
+))
+--- File loaded request (\usepackage or ...)
+ 1: testpkg
+ 2: dvips
+ 3: =beta4
+ 4: sty
+(testpkg.sty
+---\DeclareOldRelease:
+ 1: v1
+ 2: 2014-01-01
+ 3: testpkg-2014-01-01
+Label doesn't match
+---\DeclareOldRelease:
+ 1: v2
+ 2: 2018/10-01
+ 3: testpkg-2018-10-01
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Result: use testpkg-beta
+Rollback for package 'testpkg' requested -> version 'beta4'.
+ This corresponds to the release introduced on beta4.
+(testpkg-beta.sty
+Package: testpkg 2020-01-01 v4.0 test package
+ -> option dvips executed
+This is testpkg beta 4.0!
+))
diff --git a/base/testfiles/tlb-rollback-003.lvt b/base/testfiles/tlb-rollback-003.lvt
index 1a39ed0..06e436c 100644
--- a/base/testfiles/tlb-rollback-003.lvt
+++ b/base/testfiles/tlb-rollback-003.lvt
@@ -7,10 +7,24 @@
%
% A few test packages up front:
%
+\begin{filecontents}{testpkg-beta.sty}
+% this is the new beta
+\DeclareOldRelease[v1]{2014-01-01}{testpkg-2014-01-01}
+\DeclareOldRelease[v2]{2018-10-01}{testpkg-2018-10-01}
+\DeclareOldRelease[v3]{2019-07-01}{testpkg-2019-07-01} % does not yet exist :-)
+
+\ProvidesPackage{testpkg}[2020-01-01 v4.0 test package] % the future package
+\DeclareOption{dvips}{\typeout{ -> option dvips executed}}
+\ProcessOptions
+\typeout{This is testpkg beta 4.0!}
+\end{filecontents}
+
\begin{filecontents}{testpkg.sty}
% The current package ...
\DeclareOldRelease[v1]{2014-01-01}{testpkg-2014-01-01}
\DeclareOldRelease[v2]{2018/10-01}{testpkg-2018-10-01}
+\DeclareNamedRelease{testpkg-beta}
+\DeclareNamedRelease[beta4]{testpkg-beta}
\DeclareCurrentRelease[v3]{2019-07-01}
\ProvidesPackage{testpkg}[2019-07-21 v3.5 test package] % this has a
@@ -84,5 +98,11 @@
\ForgetAboutTestpkg
\usepackage[dvips]{testpkg}[=2017/02]
+\ForgetAboutTestpkg
+\usepackage[dvips]{testpkg}[=beta]
+
+\ForgetAboutTestpkg
+\usepackage[dvips]{testpkg}[=beta4]
+
\END
diff --git a/base/testfiles/tlb-rollback-003.tlg b/base/testfiles/tlb-rollback-003.tlg
index b8a2dc3..1f2b6f9 100644
--- a/base/testfiles/tlb-rollback-003.tlg
+++ b/base/testfiles/tlb-rollback-003.tlg
@@ -53,9 +53,17 @@ This is the current testpkg!
Label doesn't match
---\DeclareOldRelease:
1: v2
- 2: 2018-10-01
+ 2: 2018/10-01
3: testpkg-2018-10-01
Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Label doesn't match
---DeclareCurrentRelease
1: v3
2: 2019-07-01
@@ -91,9 +99,17 @@ If that doesn't work, type X <return> to quit.
Label doesn't match
---\DeclareOldRelease:
1: v2
- 2: 2018-10-01
+ 2: 2018/10-01
3: testpkg-2018-10-01
Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Label doesn't match
---DeclareCurrentRelease
1: v3
2: 2019-07-01
@@ -129,9 +145,17 @@ If that doesn't work, type X <return> to quit.
Label doesn't match
---\DeclareOldRelease:
1: v2
- 2: 2018-10-01
+ 2: 2018/10-01
3: testpkg-2018-10-01
Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Label doesn't match
---DeclareCurrentRelease
1: v3
2: 2019-07-01
@@ -212,3 +236,61 @@ Package: testpkg 2014-01-01 v1.2 test package
-> option dvips executed
This is testpkg 2014-01-01!
))
+--- File loaded request (\usepackage or ...)
+ 1: testpkg
+ 2: dvips
+ 3: =beta
+ 4: sty
+(testpkg.sty
+---\DeclareOldRelease:
+ 1: v1
+ 2: 2014-01-01
+ 3: testpkg-2014-01-01
+Label doesn't match
+---\DeclareOldRelease:
+ 1: v2
+ 2: 2018/10-01
+ 3: testpkg-2018-10-01
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Result: use testpkg-beta
+Rollback for package 'testpkg' requested -> version 'beta'.
+ This corresponds to the release introduced on beta.
+(testpkg-beta.sty
+Package: testpkg 2020-01-01 v4.0 test package
+ -> option dvips executed
+This is testpkg beta 4.0!
+))
+--- File loaded request (\usepackage or ...)
+ 1: testpkg
+ 2: dvips
+ 3: =beta4
+ 4: sty
+(testpkg.sty
+---\DeclareOldRelease:
+ 1: v1
+ 2: 2014-01-01
+ 3: testpkg-2014-01-01
+Label doesn't match
+---\DeclareOldRelease:
+ 1: v2
+ 2: 2018/10-01
+ 3: testpkg-2018-10-01
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta
+ 2: testpkg-beta
+Label doesn't match
+---DeclareNamedRelease
+ 1: beta4
+ 2: testpkg-beta
+Result: use testpkg-beta
+Rollback for package 'testpkg' requested -> version 'beta4'.
+ This corresponds to the release introduced on beta4.
+(testpkg-beta.sty
+Package: testpkg 2020-01-01 v4.0 test package
+ -> option dvips executed
+This is testpkg beta 4.0!
+))
More information about the latex3-commits
mailing list