[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Merge branch 'master' into develop (6d727670)

Joseph Wright joseph.wright at morningstar2.co.uk
Fri Oct 9 16:58:06 CEST 2020


Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/6d7276702d7c0c03c0d7799ae83fbacb12ed144f

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

commit 6d7276702d7c0c03c0d7799ae83fbacb12ed144f
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Oct 9 15:58:06 2020 +0100

    Merge branch 'master' into develop


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

6d7276702d7c0c03c0d7799ae83fbacb12ed144f
 base/changes.txt                                   | 44 ++++++++--
 base/doc/ltnews32.tex                              | 36 ++++-----
 base/ltclass.dtx                                   | 30 ++++++-
 base/ltfiles.dtx                                   |  6 +-
 base/ltfssini.dtx                                  | 17 ++--
 base/lthooks.dtx                                   | 93 +++++++++++++++++++---
 base/ltxdoc.dtx                                    |  9 ++-
 base/manifest.txt                                  |  1 +
 base/testfiles-legacy/utf8-test-001.tlg            |  4 +-
 base/testfiles-lthooks/github-0401.lvt             | 13 +++
 .../testfiles-lthooks/github-0401.tlg              |  1 -
 base/testfiles/github-0406.lvt                     | 35 ++++++++
 base/testfiles/github-0406.tlg                     | 17 ++++
 .../tlb-latexrelease-rollback-003-often.luatex.tlg |  4 +
 .../tlb-latexrelease-rollback-003-often.tlg        |  4 +
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  |  4 +
 base/testfiles/tlb-rollback-004-often.luatex.tlg   |  6 +-
 base/testfiles/tlb-rollback-004-often.tlg          |  6 +-
 base/testfiles/tlb-rollback-004-often.xetex.tlg    |  6 +-
 required/firstaid/changes.txt                      | 10 +++
 .../latex2e-first-aid-for-external-files.dtx       |  4 +-
 21 files changed, 289 insertions(+), 61 deletions(-)

diff --git a/base/changes.txt b/base/changes.txt
index 00407db4..36a22af1 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,45 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+================================================================================
+All changes above are only part of the development branch for the next release.
+================================================================================
+
+#########################
+# 2020-10-01 PL 1 Release
+#########################
+
+2020-10-08  Phelype Oleinik  <phelype.oleinik at latex-project.org>
+
+	* ltclass.dtx:
+	Fix loading expl3-based package after rollback to 2020-02-02 (gh/406).
+
+2020-10-08  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltfssini.dtx: removed redundant code and fixed a misspelling
+	in a csname - no functional change (gh/405)
+
+2020-10-04  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltxdoc.dtx (section{DocInclude}):
+	Quotes around the aux file name removed,
+        they are not needed and upset BibTeX (gh/400)
+
+2020-10-04  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* ltfiles.dtx (section{File Handling}):
+	Quotes around the aux file name removed,
+        they are not needed and upset BibTeX (gh/400)
+
+2020-10-04  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* lthooks.dtx (subsection{Internal commands needed elsewhere}):
+	Definition \AddToHookNext was supposed to be for \AddToHook (gh/401)
+
+#########################
+# 2020-10-01 Release
+#########################
+
 2020-10-01  Joseph Wright  <Joseph.Wright at latex-project.org>
 
 	* ltclass.dtx:
@@ -419,11 +458,6 @@ are not part of the distribution.
 	XeTeX-specific definition for \symbol to avoid bug in maths mode (gh/124)
 
 
-================================================================================
-All changes above are only part of the development branch for the next release.
-================================================================================
-
-
 #########################
 # 2020-02-02 PL 5 Release
 #########################
diff --git a/base/doc/ltnews32.tex b/base/doc/ltnews32.tex
index f26449af..85283a86 100644
--- a/base/doc/ltnews32.tex
+++ b/base/doc/ltnews32.tex
@@ -241,7 +241,7 @@ soft hyphen character (U+00AD) an alias for the \LaTeX\ soft hyphen
 \cs{-}. The Unicode engines \XeTeX{} and \LuaTeX{} behaved
 differently though: They either ignored U+00AD or interpreted it as an
 unconditional hyphen. This inconsistency is fixed now and \LaTeX{}
-always treats \texttt{U+00AD} as \cs{-}.
+always treats U+00AD as \cs{-}.
 %
 \githubissue{323}
 
@@ -308,8 +308,6 @@ by setting \cs{finalhyphendemerits} to zero in unjustified settings.
 %
 \githubissue{274}
 
-\def\negskip{\tubcommand{\vspace*{-.2pt}}}
-\negskip
 \subsection{Set a non-zero \cs{baselineskip} in text scripts}
 
 As \cs{textsuperscript} and \cs{textsubscript} usually contain only a
@@ -320,7 +318,6 @@ been adjusted.
 %
 \githubissue{249}
 
-\negskip
 \subsection{Spacing issues when using \cs{linethickness}}
 
 In some circumstances the use of \cs{linethickness} introduced a
@@ -330,7 +327,6 @@ to the right. This has been corrected.
 \githubissue{274}
 
 
-\negskip
 \subsection{Better support for the legacy series default interface}
 
 In the initial implementation of \LaTeX's font selection scheme (NFSS)
@@ -342,10 +338,9 @@ now through \cs{DeclareFontSeriesDefault}~\cite{32:ltnews31}. In this
 release we improved the support for legacy documents using the old
 method to cover additional edge cases.
 %
-\githubissue[s]{306,315}
+\githubissue[s]{306 and 315}
 
 
-\negskip
 \subsection{Support for uncommon font series defaults}
 
 If a font family was set up with fairly unusual font series defaults,
@@ -363,6 +358,8 @@ been corrected.
 %
 \githubissue{291}
 
+\tubcommand{\vspace*{-6pt}\break}
+
 \subsection{Checking the current font series context}
 
 Sometimes it is necessary to define commands that act differently when
@@ -605,13 +602,11 @@ now allowed.
 
 \subsection{Spacing commands moved from \pkg{amsmath} to the kernel}
 Originally \LaTeX{} only provided a small set of spacing commands
-for use in text and math, some of the commands like \cs{;} were
+for use in text and math; some of the commands like \cs{;} were
 only supported in math mode. \texttt{amsmath} normalized  and
 provided all of them in text and math. This code has now been
 moved to the kernel so that it is generally available.
-%
-\githubissue{303}
-
+\begin{center}
 \begin{tabular}{lll}
 command name(s)              & math   & text\\\hline
 \cs{,}  \cs{thinspace}       & $x\,x$ & x\,x\\
@@ -621,7 +616,9 @@ command name(s)              & math   & text\\\hline
 \cs{;} \cs{thickspace}       & $x\;x$ & x\;x\\
 \cs{negthickspace}           & $x\negthickspace x$ & x\negthickspace x\\
 \end{tabular}
-
+\end{center}
+%
+\githubissue{303}
 
 
 \subsection{Access raw glyphs in \LuaTeX\ without reloading fonts}
@@ -645,7 +642,8 @@ command with three arguments to the  \texttt{.toc} and similar files.
 \pkg{hyperref} redefines \cs{addcontentsline} to write
 a fourth argument. The change unifies the number of arguments
 by writing an additional empty brace group.
-
+%
+\githubissue{370}
 
 
 \subsection{Lua\TeX\ callback \texttt{new\_graf} made \texttt{exclusive}}
@@ -795,15 +793,15 @@ processed as part of the formula.
 %
 \githubissue{5}
 
-\tubcommand\newpage
 \subsection{Detect Unicode engines when setting \cs{std at minus} and \cs{std at equal}}
 
 \pkg{amsmath} now detects the Unicode engines and uses their extended
-commands to define \cs{std at minus} and \cs{std at equal}. This avoids a
-package like \pkg{unicode-math} having to patch the code in the begin
-document hook to change the commands.
+commands to define \cs{std at minus} and
+\tubcommand{\parfillskip=0pt\par\newpage\noindent}%
+\cs{std at equal}. This avoids a package like 
+\pkg{unicode-math} having to patch the code in the begin document hook to change the commands.
 
-\subsection{Use lua\TeX{} primitives}
+\subsection{Use Lua\TeX{} primitives where applicable}
 
 For a number of years \pkg{lualatex-math} patched \cs{frac},
 \cs{genfrac} and the \texttt{subarray} environment to make use of new
@@ -842,7 +840,7 @@ serve as a source for other packages.
 For further details take a look at the \pkg{babel} package
 documentation~\cite{32:babel}.
 
-
+\medskip
 \begin{thebibliography}{9}
 
 \fontsize{9.3}{11.3}\selectfont
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index bc650054..e771044e 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltclass.dtx}
-             [2020/10/01 v1.3r LaTeX Kernel (Class & Package Interface)]
+             [2020/10/08 v1.3s LaTeX Kernel (Class & Package Interface)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltclass.dtx}
@@ -561,6 +561,7 @@
 % |#4| Rest of the stack.
 % \changes{v1.3l}{2020/06/05}{Added \cs{@expl at push@filename@@}
 %          and \cs{@expl at push@filename at aux@@}}
+% \changes{v1.3s}{2020/10/08}{Added missing 2020/02/02 \cs{IncludeInRelease}}
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
@@ -586,6 +587,27 @@
     \@currnamestack}%
   \@expl at push@filename at aux@@}
 %<latexrelease>\EndIncludeInRelease
+%    \end{macrocode}
+%
+%   The following version of \cs{@pushfilename} didn't formally exist in
+%   this file, but in the 2020/02/02 release, \pkg{expl3} was preloaded
+%   and it patched \cs{@pushfilename} (and \cs{@popfilename}) by adding
+%   some hooks in there.  But rolling back to 2020/02/02, \pkg{expl3}
+%   doesn't patch these macros again, so rolling back has to take those
+%   hooks into account.  Same goes for \cs{@popfilename}.
+%    \begin{macrocode}
+%<latexrelease>
+%<latexrelease>\IncludeInRelease{2020/02/02}{\@pushfilename}%
+%<latexrelease>  {Add \@expl at push@filename@@}%
+%<latexrelease>\def\@pushfilename{%
+%<latexrelease>  \@expl at push@filename@@
+%<latexrelease>  \xdef\@currnamestack{%
+%<latexrelease>    {\@currname}%
+%<latexrelease>    {\@currext}%
+%<latexrelease>    {\the\catcode`\@}%
+%<latexrelease>    \@currnamestack}%
+%<latexrelease>    \@expl at push@filename at aux@@}
+%<latexrelease>\EndIncludeInRelease
 %<latexrelease>
 %<latexrelease>\IncludeInRelease{0000/00/00}{\@pushfilename}%
 %<latexrelease>  {Add \@expl at push@filename@@ and \@expl at push@filename at aux@@}%
@@ -613,6 +635,12 @@
   \@expl at pop@filename@@}
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>
+%<latexrelease>\IncludeInRelease{2020/02/02}{\@popfilename}%
+%<latexrelease>  {Add \@expl at push@filename@@}%
+%<latexrelease>\def\@popfilename{\expandafter\@p at pfilename\@currnamestack\@nil
+%<latexrelease>  \@expl at pop@filename@@}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
 %<latexrelease>\IncludeInRelease{0000/00/00}{\@popfilename}%
 %<latexrelease>  {Add \@expl at push@filename@@ and \@expl at push@filename at aux@@}%
 %<latexrelease>\def\@popfilename{\expandafter\@p at pfilename\@currnamestack\@nil}
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 835f600e..99be77c8 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfiles.dtx}
-             [2020/08/21 v1.2i LaTeX Kernel (File Handling)]
+             [2020/10/04 v1.2j LaTeX Kernel (File Handling)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfiles.dtx}
@@ -824,11 +824,13 @@
 %<latexrelease>                 {\@include}{Spaces in file names and hooks}%
 %    \end{macrocode}
 %    
+% \changes{v1.2j}{2020/10/04}{Quotes around the aux file name removed,
+%                       they are not needed and upset BibTeX (gh/400)}
 %    \begin{macrocode}
 \def\@include#1 {%
   \clearpage
   \if at filesw
-    \immediate\write\@mainaux{\string\@input{"#1.aux"}}%
+    \immediate\write\@mainaux{\string\@input{#1.aux}}%
   \fi
   \@tempswatrue
   \if at partsw
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index 10f3dc58..fbea725c 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -36,7 +36,7 @@
 %
 %
 \ProvidesFile{ltfssini.dtx}
-             [2020/09/30 v3.2d LaTeX Kernel (NFSS Initialisation)]
+             [2020/10/08 v3.2e LaTeX Kernel (NFSS Initialisation)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -1070,17 +1070,23 @@
 %  \begin{macro}{\@rmfamilyhook}
 %  \begin{macro}{\@sffamilyhook}
 %  \begin{macro}{\@ttfamilyhook}
+%  \begin{macro}{\@defaultfamilyhook}
+% \changes{v3.1h}{2020/02/10}{Add \cs{@defaultfamilyhook} to \cs{normalfont} (gh/269)}
 %     These four hooks have legacy versions used in 2020/02/02 so we
 %    should support them until they aren't any longer used.
+%
+%    By default the hooks do nothing.
 %    \begin{macrocode}
 \let\@rmfamilyhook\@empty
 \let\@sffamilyhook\@empty
 \let\@ttfamilyhook\@empty
-\let\@defaulfamilyhook\@empty
+\let\@defaultfamilyhook\@empty   %FMi sort out
 %    \end{macrocode}
 %  \end{macro}
 %  \end{macro}
 %  \end{macro}
+%  \end{macro}
+%
 %
 %    \begin{macrocode}
 %</2ekernel|latexrelease>
@@ -1787,13 +1793,6 @@
 % \end{macro}
 %    
 %
-%  \begin{macro}{\@defaultfamilyhook}
-%    By default the hooks do nothing.
-% \changes{v3.1h}{2020/02/10}{Add \cs{@defaultfamilyhook} to \cs{normalfont} (gh/269)}
-%    \begin{macrocode}
-\let\@defaultfamilyhook\@empty  %FMi sort out
-%    \end{macrocode}
-%  \end{macro}
 %
 %    \begin{macrocode}
 %</2ekernel|latexrelease>
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index cb48570a..a5953cc2 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -31,8 +31,8 @@
 %%% From File: lthooks.dtx
 %
 %    \begin{macrocode}
-\def\lthooksversion{v1.0b}
-\def\lthooksdate{2020/09/21}
+\def\lthooksversion{v1.0d}
+\def\lthooksdate{2020/10/09}
 %    \end{macrocode}
 %
 %<*driver>
@@ -256,6 +256,11 @@
 %    is used in a package/class, then the current
 %    package/class name is used, otherwise \hook{top-level} is used.
 %
+%    If the code for that \meta{label} wasn't yet added to the
+%    \meta{hook}, an order is set so that when some code attempts to add
+%    that label, the removal order takes action and the code is not
+%    added.
+%
 %    If the optional argument is \texttt{*}, then all code chunks are
 %    removed. This is rather dangerous as it drops code from other
 %    packages one may not know about!
@@ -648,10 +653,72 @@
 %
 %   \cs{LogHook} prints the information to the |.log| file, and
 %   \cs{ShowHook} prints them to the terminal/command window and starts
-%   \TeX's prompt (only if \cs{errorstopmode}) to wait for user action.
+%   \TeX's prompt (only in \cs{errorstopmode}) to wait for user action.
 %
 %    The \meta{hook} can be specified using the dot-syntax to denote
 %    the current package name. See section~\ref{sec:default-label}.
+%
+%^^A   % Code for the listing below:
+%^^A   \NewHook{example-hook}
+%^^A   \AddToHook{example-hook}[foo]{[code from package 'foo']}
+%^^A   \AddToHook{example-hook}[bar]{[from package 'bar']}
+%^^A   \AddToHook{example-hook}[baz]{[package 'baz' is here]}
+%^^A   \AddToHookNext{example-hook}{[one-time code]}
+%^^A   \DeclareHookRule{example-hook}{baz}{before}{foo}
+%^^A   \DeclareDefaultHookRule{bar}{after}{baz}
+%^^A   \ShowHook{example-hook}
+%
+%   \def\theFancyVerbLine{\textcolor[gray]{0.5}{%^^A
+%     \sffamily\tiny\arabic{FancyVerbLine}}}
+%
+%   \bigskip
+%   Suppose a hook \texttt{example-hook} whose output of
+%   \cs{ShowHook}|{example-hook}| is:
+%   \begin{verbatim}[numbers=left]
+%   -> The hook 'example-hook':
+%   > Code chunks:
+%   >     foo -> [code from package 'foo']
+%   >     bar -> [from package 'bar']
+%   >     baz -> [package 'baz' is here]
+%   > Extra code for next invocation:
+%   >     -> [one-time code]
+%   > Rules:
+%   >     foo|baz with relation >
+%   >     baz|bar with default relation <
+%   > Execution order (after applying rules):
+%   >     bar, baz, foo.
+%   \end{verbatim}
+%
+%   In the listing above, lines~3 to~5 show the three code chunks added
+%   to the hook and their respective labels in the format
+%   \begin{quote}
+%   \quad \meta{label}\verb| -> |\meta{code}
+%   \end{quote}
+%
+%   Line~7 shows the code chunk for the next execution of the hook in
+%   the format
+%   \begin{quote}
+%   \quad \verb|-> |\meta{next-code}
+%   \end{quote}
+%   This code will be used and disappear at the next
+%   \verb|\UseHook{example-hook}|, in contrast to the chunks mentioned
+%   earlier, which can only be removed from that hook by doing
+%   \verb|\RemoveFromHook{|\meta{label}|}[example-hook]|.
+%
+%   Lines~9 and~10 show the rules declared that affect this hook in the
+%   format
+%   \begin{quote}
+%   \quad \meta{label-1}\verb+|+\meta{label-2}| with |%^^A
+%         \meta{\texttt{default}?}| relation |\meta{relation}
+%   \end{quote}
+%   which means that the \meta{relation} applies to \meta{label-1} and
+%   \meta{label-2}, in that order, as detailed in \cs{DeclareHookRule}.
+%   If the relation is \texttt{default} it means that that rule applies
+%   to \meta{label-1} and \meta{label-2} in \emph{all} hooks, (unless
+%   overrided by a non-default relation).
+%
+%   Finally, line~12 lists the labels in the hook after sorting;
+%   that is, in the order they will be executed when the hook is used.
 % \end{function}
 %
 %
@@ -3964,19 +4031,21 @@
 %    may be used in packages without rollback functionality. So we
 %    just make them do nothing which may or may not work depending on
 %    the code usage.
+% \changes{v1.0d}{2020/10/04}{Definition \cs{AddToHookNext} was supposed
+%                             to be for \cs{AddToHook} vize versa (gh/401)}
 %    \begin{macrocode}
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
 %<latexrelease>                 {\NewHook}{The hook management}%
 %<latexrelease>
-%<latexrelease>\def \NewHook#1{}
-%<latexrelease>\def \NewReversedHook#1{}
-%<latexrelease>\def \NewMirroredHookPair#1#2{}
+%<latexrelease>\def\NewHook#1{}
+%<latexrelease>\def\NewReversedHook#1{}
+%<latexrelease>\def\NewMirroredHookPair#1#2{}
 %<latexrelease>
-%<latexrelease>\long\def \AddToHook#1#2{}
+%<latexrelease>\long\def\AddToHookNext#1#2{}
 %<latexrelease>
-%<latexrelease>\def \AddToHookNext#1{\@gobble at AddToHook@args}
+%<latexrelease>\def\AddToHook#1{\@gobble at AddToHook@args}
 %<latexrelease>\providecommand\@gobble at AddToHook@args[2][]{}
 %<latexrelease>
 %<latexrelease>\def\RemoveFromHook#1{\@gobble at RemoveFromHook@arg}
@@ -3988,17 +4057,17 @@
 %<latexrelease>\let \DebugHooksOn \@empty
 %<latexrelease>\let \DebugHooksOff\@empty
 %<latexrelease>
-%<latexrelease>\def \DeclareHookRul#1#2#3#4{}
+%<latexrelease>\def \DeclareHookRule #1#2#3#4{}
 %<latexrelease>\def \DeclareDefaultHookRule #1#2#3{}
-%<latexrelease>\def \ClearHookRule#1#2#3{}
+%<latexrelease>\def \ClearHookRule #1#2#3{}
 %    \end{macrocode}
 %    If the hook management is not provided we make the test for existence
 %    false and the test for empty true in the hope that this is most
 %    of the time reasonable. If not a package would need to guard
 %    against running in an old kernel.
 %    \begin{macrocode}
-%<latexrelease>\def \IfHookExistTF #1#2#3{#3}
-%<latexrelease>\def \IfHookEmptyTF #1#2#3{#2}
+%<latexrelease>\long\def \IfHookExistsTF #1#2#3{#3}
+%<latexrelease>\long\def \IfHookEmptyTF #1#2#3{#2}
 %<latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
diff --git a/base/ltxdoc.dtx b/base/ltxdoc.dtx
index 696af32a..0c7130c3 100644
--- a/base/ltxdoc.dtx
+++ b/base/ltxdoc.dtx
@@ -30,7 +30,7 @@
 %
 %<class>\NeedsTeXFormat{LaTeX2e}
 %<class>\ProvidesClass{ltxdoc}
-%<class>         [2020/08/21 v2.1a Standard LaTeX documentation class]
+%<class>         [2020/10/04 v2.1b Standard LaTeX documentation class]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -443,7 +443,12 @@
     \expandafter\@docinclude\expandafter{\@curr at file}
  \fi}
 \def\@docinclude#1 {\clearpage
-\if at filesw \immediate\write\@mainaux{\string\@input{"#1.aux"}}\fi
+%    \end{macrocode}
+%    
+% \changes{v2.1bj}{2020/10/04}{Quotes around the aux file name removed,
+%                       they are no longer needed and upset BibTeX (gh/400)}
+%    \begin{macrocode}
+\if at filesw \immediate\write\@mainaux{\string\@input{#1.aux}}\fi
 \@tempswatrue\if at partsw \@tempswafalse\edef\@tempb{#1}\@for
 \@tempa:=\@partlist\do{\ifx\@tempa\@tempb\@tempswatrue\fi}\fi
 \if at tempswa \let\@auxout\@partaux \if at filesw
diff --git a/base/manifest.txt b/base/manifest.txt
index 449b250e..f3c8f2b2 100644
--- a/base/manifest.txt
+++ b/base/manifest.txt
@@ -114,6 +114,7 @@
 % ltspace.dtx     --  Spacing, line and page breaking.
 % ltlogos.dtx     --  Logos.
 % ltlists.dtx     --  Code for lists and related environments.
+% ltluatex.dtx    --  LuaTeX engine related code.
 % ltmath.dtx      --  Code for math.
 % ltmiscen.dtx    --  Code for miscellaneous environments.
 % ltoutenc.dtx    --  Code for output encoding commands.
diff --git a/base/testfiles-legacy/utf8-test-001.tlg b/base/testfiles-legacy/utf8-test-001.tlg
index 20e49423..998eb0de 100644
--- a/base/testfiles-legacy/utf8-test-001.tlg
+++ b/base/testfiles-legacy/utf8-test-001.tlg
@@ -9,7 +9,7 @@ LaTeX Warning: File `f^^c3^^bc^^c3^^9fe^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.tex'
 LaTeX Warning: File `f^^c3^^bc^^c3^^9fe im sand.tex' already exists on the system.
                Not generating it from this source.
 (utf8-test-001.aux (f^^c3^^bc^^c3^^9fe^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux)
-No file "^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux".
+No file ^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux.
 )
 LaTeX Font Info:    Checking defaults for OML/cmm/m/it on input line ....
 LaTeX Font Info:    ... okay on input line ....
@@ -54,6 +54,6 @@ l. ...\show\foo
 l. ...\showbox0
 [3
 ] (utf8-test-001.aux (f^^c3^^bc^^c3^^9fe^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux)
-No file "^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux".
+No file ^^e2^^82^^ac^^e2^^82^^ac^^e2^^82^^ac.aux.
 )
 LaTeX Warning: There were undefined references.
diff --git a/base/testfiles-lthooks/github-0401.lvt b/base/testfiles-lthooks/github-0401.lvt
new file mode 100644
index 00000000..e1e095f5
--- /dev/null
+++ b/base/testfiles-lthooks/github-0401.lvt
@@ -0,0 +1,13 @@
+\documentclass{article}
+
+\RequirePackage[0000/00/00]{latexrelease}
+
+\input{regression-test}
+\begin{document}
+\START
+
+\AddToHook{begindocument}[mypackage]{\relax}
+
+\ShowHook{begindocument}
+
+\END
diff --git a/required/firstaid/testfiles/firstaid-000.tlg b/base/testfiles-lthooks/github-0401.tlg
similarity index 81%
copy from required/firstaid/testfiles/firstaid-000.tlg
copy to base/testfiles-lthooks/github-0401.tlg
index ed2129b9..bfbef442 100644
--- a/required/firstaid/testfiles/firstaid-000.tlg
+++ b/base/testfiles-lthooks/github-0401.tlg
@@ -1,3 +1,2 @@
 This is a generated file for the l3build validation system.
 Don't change this file in any respect.
-File loaded in kernel
diff --git a/base/testfiles/github-0406.lvt b/base/testfiles/github-0406.lvt
new file mode 100644
index 00000000..30cf538d
--- /dev/null
+++ b/base/testfiles/github-0406.lvt
@@ -0,0 +1,35 @@
+
+\begin{filecontents}{testpack.sty}
+\ProvidesExplPackage {testpack} {2020-10-08} {0.1}
+  {A package for testing}
+\end{filecontents}
+
+
+\documentclass{article}
+
+\input{test2e}
+\START
+\OMIT
+
+\def\test#1{
+\expandafter\let\csname ver at latexrelease.sty\endcsname\relax
+\expandafter\let\csname ver at testpack.sty\endcsname\relax
+\RequirePackage[#1]{latexrelease}
+
+\TIMO
+\typeout{\the\catcode`\ }
+\RequirePackage{testpack}
+\typeout{\the\catcode`\ }
+\OMIT
+
+\ExplSyntaxOff
+}
+
+\test{2020-02-02} % expl3 preloaded
+
+\test{2019-10-01} % no expl3
+
+\test{2018-12-01}
+
+\TIMO
+\END
diff --git a/base/testfiles/github-0406.tlg b/base/testfiles/github-0406.tlg
new file mode 100644
index 00000000..ba7e7ffa
--- /dev/null
+++ b/base/testfiles/github-0406.tlg
@@ -0,0 +1,17 @@
+This is a generated file for the LaTeX2e validation system.
+Don't change this file in any respect.
+10
+(testpack.sty
+Package: testpack ....-..-.. v... A package for testing
+)
+10
+10
+(testpack.sty
+Package: testpack ....-..-.. v... A package for testing
+)
+10
+10
+(testpack.sty
+Package: testpack ....-..-.. v... A package for testing
+)
+10
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 4fe41645..e1262657 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -225,8 +225,10 @@ Applying: [....-..-..] negative height floats on input line ....
 Skipping: [....-..-..] 2 column marks on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
@@ -716,8 +718,10 @@ Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Already applied: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index e51b03dd..bc2ef53f 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -223,8 +223,10 @@ Applying: [....-..-..] negative height floats on input line ....
 Skipping: [....-..-..] 2 column marks on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
@@ -708,8 +710,10 @@ Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Already applied: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index 3cd8c217..73d794c5 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -223,8 +223,10 @@ Applying: [....-..-..] negative height floats on input line ....
 Skipping: [....-..-..] 2 column marks on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
@@ -717,8 +719,10 @@ Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Already applied: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
+Skipping: [....-..-..] Add \@expl at push@filename@@  on input line ....
 Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index e6a5f57c..3bbff5ed 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -314,9 +314,11 @@ Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Already applied: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
-Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Applying: [....-..-..] Add \@expl at push@filename@@  on input line ....
+Already applied: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
-Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Applying: [....-..-..] Add \@expl at push@filename@@  on input line ....
+Already applied: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Guard against bad input on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 2440cc2d..f367ea1d 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -312,9 +312,11 @@ Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Already applied: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
-Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Applying: [....-..-..] Add \@expl at push@filename@@  on input line ....
+Already applied: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
-Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Applying: [....-..-..] Add \@expl at push@filename@@  on input line ....
+Already applied: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Guard against bad input on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index dcd9316f..e6b5920e 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -312,9 +312,11 @@ Already applied: [....-..-..] negative height floats on input line ....
 Applying: [....-..-..] 2 column marks on input line ....
 Already applied: [....-..-..] 2 column marks on input line ....
 Skipping: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
-Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Applying: [....-..-..] Add \@expl at push@filename@@  on input line ....
+Already applied: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Add \@expl at pop@filename@@  on input line ....
-Applying: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
+Applying: [....-..-..] Add \@expl at push@filename@@  on input line ....
+Already applied: [....-..-..] Add \@expl at push@filename@@ and \@expl at push@filename at aux@@  on input line ....
 Skipping: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Test format date on input line ....
 Applying: [....-..-..] Guard against bad input on input line ....
diff --git a/required/firstaid/changes.txt b/required/firstaid/changes.txt
index 0b34d6d0..ef734a33 100644
--- a/required/firstaid/changes.txt
+++ b/required/firstaid/changes.txt
@@ -1,3 +1,13 @@
+2020-10-04  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* latex2e-first-aid-for-external-files.dtx:
+	Fix for gh400 taken out and moved into the kernel instead for PL1.
+
+2020-10-03  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
+
+	* latex2e-first-aid-for-external-files.dtx:
+	Added a fix for gh400. This will soon move into the kernel.
+
 2020-09-29  Frank Mittelbach  <Frank.Mittelbach at latex-project.org>
 
 	* latex2e-first-aid-for-external-files.dtx:
diff --git a/required/firstaid/latex2e-first-aid-for-external-files.dtx b/required/firstaid/latex2e-first-aid-for-external-files.dtx
index e722438f..78f52ca7 100644
--- a/required/firstaid/latex2e-first-aid-for-external-files.dtx
+++ b/required/firstaid/latex2e-first-aid-for-external-files.dtx
@@ -99,8 +99,8 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\def\LaTeXFirstAidDate{2020/09/29}
-\def\LaTeXFirstAidVersion{v1.0c}
+\def\LaTeXFirstAidDate{2020/10/04}
+\def\LaTeXFirstAidVersion{v1.0e}
 %    \end{macrocode}
 %
 %    \begin{macrocode}





More information about the latex3-commits mailing list.