[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: save version string for issue #825 (#826) (e6d846e1)
GitHub
noreply at github.com
Mon May 30 12:31:47 CEST 2022
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/e6d846e14fa61befa7708017505cce18784abe38
>---------------------------------------------------------------
commit e6d846e14fa61befa7708017505cce18784abe38
Author: David Carlisle <d.p.carlisle at gmail.com>
Date: Mon May 30 11:31:47 2022 +0100
save version string for issue #825 (#826)
* save version string for issue #825
* drop stray line
* removed leftover line from merge and added a bit more documentation
Co-authored-by: Frank Mittelbach <frank.mittelbach at latex-project.org>
>---------------------------------------------------------------
e6d846e14fa61befa7708017505cce18784abe38
base/changes.txt | 7 +++++++
base/ltfiles.dtx | 12 +++++++++++-
base/ltoutenc.dtx | 5 ++++-
.../{tlb-utf8-undec-cp1252.lvt => github-0825.lvt} | 14 +++++---------
base/testfiles/github-0825.tlg | 11 +++++++++++
base/testfiles/github-0825.xetex.tlg | 11 +++++++++++
6 files changed, 49 insertions(+), 11 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index d9cc82f3..59966cb8 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,13 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================
+2022-05-27 David Carlisle <David.Carlisle at latex-project.org>
+
+ * ltfiles.dtx, ltoutenc.dtx:
+ save the original version string in \ver@@...
+ Usable by \listfiles if the standard \ver at ... command has been set to \relax
+ (as in fontenc.sty) gh/825
+
2022-05-27 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltxdoc.dtx (section{Customisation}):
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 2a87756d..d99dfdcd 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfiles.dtx}
- [2022/04/01 v1.2q LaTeX Kernel (File Handling)]
+ [2022/05/27 v1.2r LaTeX Kernel (File Handling)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfiles.dtx}
@@ -1640,6 +1640,7 @@
%
% \changes{v1.0o}{1994/11/30}
% {Use \cs{@dofilelist}}
+% \changes{v1.2r}{2022/05/27}{Try saved version string, if ver at .. is \cs{relax} (gh/825)}
% \begin{macrocode}
\def\@dofilelist{%
\typeout{^^J *File List*}%
@@ -1650,6 +1651,15 @@
\ifx\filename at ext\relax tex\else\filename at ext\fi}%
\expandafter\let\expandafter\reserved at b
\csname ver@\reserved at a\endcsname
+% \end{macrocode}
+% Packages that \cs{relax} their \cs{ver at ...} string to allow for
+% multiple loading (e.g., \pkg{fontenc}) can use \cs{ver@@...} to
+% store the version information instead.
+% \begin{macrocode}
+ \ifx\reserved at b\relax
+ \expandafter\let\expandafter\reserved at b
+ \csname ver@@\reserved at a\endcsname
+ \fi
\expandafter\expandafter\expandafter\@listfiles\expandafter
\filename at area\filename at base\\\\\\\\\\\\\\\\\\\@@
\typeout{%
diff --git a/base/ltoutenc.dtx b/base/ltoutenc.dtx
index 8e486741..4dac4e15 100644
--- a/base/ltoutenc.dtx
+++ b/base/ltoutenc.dtx
@@ -44,7 +44,7 @@
%<*driver>
% \fi
\ProvidesFile{ltoutenc.dtx}
- [2021/12/12 v2.0y LaTeX Kernel (font encodings)]
+ [2022/05/27 v2.0z LaTeX Kernel (font encodings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltoutenc.dtx}
@@ -3764,7 +3764,10 @@
\@elt{\csname opt at fontenc.sty\endcsname}}
% \end{macrocode}
%
+% \changes{v2.0z}{2022/05/27}{Save the version string (gh/825)}
% \begin{macrocode}
+\global\expandafter\let\csname ver@@fontenc.sty\expandafter\endcsname
+ \csname ver at fontenc.sty\endcsname
\global\expandafter\let\csname ver at fontenc.sty\endcsname\relax
\global\expandafter\let\csname opt at fontenc.sty\endcsname\relax
\global\let\@ifl at ter@@\@ifl at ter
diff --git a/base/testfiles/tlb-utf8-undec-cp1252.lvt b/base/testfiles/github-0825.lvt
similarity index 61%
copy from base/testfiles/tlb-utf8-undec-cp1252.lvt
copy to base/testfiles/github-0825.lvt
index a87259af..308ac4e3 100644
--- a/base/testfiles/tlb-utf8-undec-cp1252.lvt
+++ b/base/testfiles/github-0825.lvt
@@ -1,15 +1,11 @@
-\input{test2e}
-% undeclared cp1252
+\listfiles
\documentclass{article}
\usepackage[T1]{fontenc}
+\input{test2e}
+% \listfiles should give fontenc version
\begin{document}
-
+x
+\clearpage
\START
-\showoutput
-
-a\"O ``x'' \ss
-
-aÖ “x” ß
-
\end{document}
diff --git a/base/testfiles/github-0825.tlg b/base/testfiles/github-0825.tlg
new file mode 100644
index 00000000..eedf736c
--- /dev/null
+++ b/base/testfiles/github-0825.tlg
@@ -0,0 +1,11 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+(github-0825.aux)
+ *File List*
+ article.cls ....-..-.. v... Standard LaTeX document class
+ size10.clo ....-..-.. v... Standard LaTeX file (size option)
+ fontenc.sty ....-..-.. v... Standard LaTeX package
+ test2e.tex
+ expl3.sty ....-..-.. L3 programming layer (loader)
+l3backend-dvips.def ....-..-.. L3 backend support: dvips
+ ***********
diff --git a/base/testfiles/github-0825.xetex.tlg b/base/testfiles/github-0825.xetex.tlg
new file mode 100644
index 00000000..92ab7d27
--- /dev/null
+++ b/base/testfiles/github-0825.xetex.tlg
@@ -0,0 +1,11 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+(github-0825.aux)
+ *File List*
+ article.cls ....-..-.. v... Standard LaTeX document class
+ size10.clo ....-..-.. v... Standard LaTeX file (size option)
+ fontenc.sty ....-..-.. v... Standard LaTeX package
+ test2e.tex
+ expl3.sty ....-..-.. L3 programming layer (loader)
+l3backend-xetex.def ....-..-.. L3 backend support: XeTeX
+ ***********
More information about the latex3-commits
mailing list.