[latex3-commits] [git/LaTeX3-latex3-latex2e] gh825: save version string for issue #825 (1e1d7023)

[David Carlisle]

Repository : https://github.com/latex3/latex2e
On branch  : gh825
Link       : https://github.com/latex3/latex2e/commit/1e1d7023461a312aeb205d810c58694472dba849

>---------------------------------------------------------------

commit 1e1d7023461a312aeb205d810c58694472dba849
Author: David Carlisle <d.p.carlisle at gmail.com>
Date:   Fri May 27 15:12:17 2022 +0100

    save version string for issue #825


>---------------------------------------------------------------

1e1d7023461a312aeb205d810c58694472dba849
 base/changes.txt                                           |  7 +++++++
 base/ltfiles.dtx                                           |  8 +++++++-
 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, 45 insertions(+), 11 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 86a04060..2390d5c5 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -7,6 +7,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-02-21  Joseph Wright  <Joseph.Wright at latex-project.org>
 
         * ltkeys.dtx:
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 9b31b501..20d6815c 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfiles.dtx}
-             [2021/10/14 v1.2p LaTeX Kernel (File Handling)]
+             [2022/05/27 v1.2q LaTeX Kernel (File Handling)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfiles.dtx}
@@ -1565,6 +1565,7 @@
 % \changes{v1.0i}{1994/10/18}
 %         {code moved here from ltclass}
 %    \begin{macrocode}
+%    \begin{macrocode}
 \def\listfiles{%
   \let\listfiles\relax
   \def\@listfiles##1##2##3##4##5##6##7##8##9\@@{%
@@ -1577,6 +1578,7 @@
 %
 % \changes{v1.0o}{1994/11/30}
 %         {Use \cs{@dofilelist}}
+% \changes{v1.2q}{2022/05/27}{Try saved version string, if ver at .. is \cs{relax} (gh/825)}
 %    \begin{macrocode}
   \def\@dofilelist{%
      \typeout{^^J *File List*}%
@@ -1587,6 +1589,10 @@
           \ifx\filename at ext\relax tex\else\filename at ext\fi}%
        \expandafter\let\expandafter\reserved at b
                               \csname ver@\reserved at a\endcsname
+       \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
+ ***********