Merge pull request #1425 from muzimuzhi/fix/gh1413-size-and-hash

Add selected pkg/cls release to the file list, gh1413
latex3 · Aug 30, 2024 · 45feedd · 45feedd
2 parents ac625d8 + 06ce950
commit 45feedd
Show file tree

Hide file tree

Showing 7 changed files with 65 additions and 1 deletion.
diff --git a/base/changes.txt b/base/changes.txt
@@ -11,6 +11,10 @@ not part of the distribution.
 	* ltluatex.dtx:
 	Allow for missing version string in Lua modules (gh/1443)
 
+2024-08-03  Yukai Chou  <muzimuzhi@gmail.com>
+	* ltclass.dtx (section{Package/class rollback mechanism}):
+	Add selected release to the file list (gh/1413)
+
 2024-08-12  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
 
 	* letter.dtx (subsection{The generic letter commands}):

diff --git a/base/doc/ltnews40.tex b/base/doc/ltnews40.tex
@@ -298,6 +298,18 @@ \subsection{Handling of global keys with spaces}
 %
 \githubissue{1238}
 
+\subsection{File list entries for rolled back packages/classes}
+When the rollback mechanism for packages and classes was introduced
+in 2018~\cite{40:ltnews28}, loading of the selected historic release
+was not recorded in the file list used by \cs{listfiles}.
+This has now been corrected so that the extended usage~\cite{40:ltnews39}
+\begin{verbatim}
+\listfiles[hashes,sizes]
+\end{verbatim}
+now gives more complete and less confusing info.
+%
+\githubissue{1413}
+
 \subsection{\pkg{doc}:\ \cs{PrintDescribeMacro} in preamble}
 
 In \pkg{doc} version 2 it was possible alter the definition of
@@ -405,6 +417,10 @@ \subsection{\pkg{longtable}: Extend caption type}
   \emph{\LaTeXe{} news 1--39}. June, 2024.
   \url{https://latex-project.org/news/latex2e-news/ltnews.pdf}
 
+\bibitem{40:ltnews28} \LaTeX{} Project Team.
+  \emph{\LaTeXe{} news 28}. April 2018.
+  \url{https://latex-project.org/news/latex2e-news/ltnews28.pdf}
+
 \bibitem{40:ltnews35} \LaTeX{} Project Team.
   \emph{\LaTeXe{} news 35}. June 2022.
   \url{https://latex-project.org/news/latex2e-news/ltnews35.pdf}

diff --git a/base/ltclass.dtx b/base/ltclass.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltclass.dtx}
-             [2024/08/28 v1.5l LaTeX Kernel (Class & Package Interface)]
+             [2024/08/28 v1.5m LaTeX Kernel (Class & Package Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltclass.dtx}
@@ -3933,8 +3933,11 @@
 %    first line of the |\@@input|!
 % \changes{v1.2e}{2018/03/24}
 %         {Use full file name for old release}
+% \changes{v1.5m}{2024/08/03}
+%         {Add selected release to the file list (gh/1413)}
 %    \begin{macrocode}
    \pkgcls@targetdate\z@
+   \@addtofilelist{#1}%
    \@@input #1\relax
    \endinput
 }

diff --git a/base/testfiles/github-1413.lvt b/base/testfiles/github-1413.lvt
@@ -0,0 +1,33 @@
+\edef\pkgname{\jobname-testpkg}
+
+\begin{filecontents}{\pkgname.sty}
+\DeclareRelease{}{2023-10-10}{\pkgname-2023-10-10.sty}
+\DeclareCurrentRelease{}{2024-01-01}
+
+\ProvidesPackage{\pkgname}[2024-01-01 v2.0 test package]
+\end{filecontents}
+
+\begin{filecontents}{\pkgname-2023-10-10.sty}
+\ProvidesPackage{\pkgname}[2023-10-10 v2.0 test package]
+\end{filecontents}
+
+\RequirePackage[2023-11-01]{latexrelease}
+
+\documentclass{article}
+\listfiles
+
+\input{test2e}
+
+\ExplSyntaxOn
+\sys_ensure_backend:
+\ExplSyntaxOff
+\makeatletter
+% clear file list
+\global\let\@filelist\@gobble
+\makeatother
+
+\usepackage{\pkgname}
+
+\START
+\UseOneTimeHook{enddocument/info}
+\END
diff --git a/base/testfiles/github-1413.tlg b/base/testfiles/github-1413.tlg
@@ -0,0 +1,6 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+ *File List*
+github-1413-testpkg.sty    ....-..-.. v... test package
+github-1413-testpkg-....-..-...sty
+ ***********
diff --git a/required/graphics/testfiles/utf8-filenames-002.tlg b/required/graphics/testfiles/utf8-filenames-002.tlg
@@ -91,6 +91,7 @@ l3backend-dvips.def    ....-..-.. L3 backend support: dvips
 graphicx.sty    ....-..-.. v... Enhanced LaTeX Graphics (DPC,SPQR)
   keyval.sty    ....-..-.. v... key=value parser (DPC)
 graphics.sty    ....-..-.. v... Standard LaTeX Graphics (DPC,SPQR)
+graphics-....-..-...sty
     trig.sty    ....-..-.. v... sin cos tan (DPC)
 graphics.cfg    ....-..-.. v... sample graphics configuration
    dvips.def    ....-..-.. v... Graphics/color driver for dvips

diff --git a/required/graphics/testfiles/utf8-filenames-002.xetex.tlg b/required/graphics/testfiles/utf8-filenames-002.xetex.tlg
@@ -79,6 +79,7 @@ l3backend-xetex.def    ....-..-.. L3 backend support: XeTeX
 graphicx.sty    ....-..-.. v... Enhanced LaTeX Graphics (DPC,SPQR)
   keyval.sty    ....-..-.. v... key=value parser (DPC)
 graphics.sty    ....-..-.. v... Standard LaTeX Graphics (DPC,SPQR)
+graphics-....-..-...sty
     trig.sty    ....-..-.. v... sin cos tan (DPC)
 graphics.cfg    ....-..-.. v... sample graphics configuration
    xetex.def    ....-..-.. v... Graphics/color driver for xetex