[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: fix errors spotted by Phelype and Ulrike (40208055)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : lthooks2
Link       : https://github.com/latex3/latex2e/commit/402080555839c7eea01a318d516f626072a70afc

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

commit 402080555839c7eea01a318d516f626072a70afc
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Aug 21 23:23:26 2020 +0200

    fix errors spotted by Phelype and Ulrike


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

402080555839c7eea01a318d516f626072a70afc
 base/ltfilehook.dtx |  2 +-
 base/ltfiles.dtx    | 14 ++++++++++----
 base/lthooks.dtx    |  2 +-
 base/ltmiscen.dtx   |  6 +++---
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index b1971132..c02d2b08 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -387,7 +387,7 @@
 %    \meta{alternate-code} which could issue a warning, error or any
 %    other code.
 %
-%    The main use case is for classesthat want to restrict the set of
+%    The main use case is for classes that want to restrict the set of
 %    supported packages or contain code that make the use of some
 %    packages impossible. So rather than waiting until the document
 %    breaks they can set up informative messages why certain packages
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 9a80a5b9..d55a91be 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -327,6 +327,14 @@
       \let\normalsfcodes\nonfrenchspacing
     \fi
   \fi
+%    \end{macrocode}
+% For similar reasons also save the default language, this will be reset
+% locally in the output routine. In particular it allows hyphenation
+% in the page head even if the page break happens in verbatim.
+% If this has already been set by a package, set to the value of |\language|
+% at this spoint.
+% \changes{v1.1n}{2017/03/10}{Save language default}
+%    \begin{macrocode}
   \ifx\document at default@language\m at ne
     \chardef\document at default@language\language
   \fi
@@ -687,9 +695,6 @@
 % \changes{v1.2g}{2020-05-02}{Pass the filename to \cs{@include} by
 %    value instead of by reference (gh/217)} 
 %
-%    With space stripping in place in \cs{set at curr@file} we need to
-%    add the space after it has acted to keep the legacy interface of
-%    \cs{@include}.
 %    \begin{macrocode}
 %</2ekernel>
 %<*2ekernel|latexrelease>
@@ -884,6 +889,7 @@
   \fi
   \let\@auxout\@mainaux}
 %<latexrelease>\EndIncludeInRelease
+%</2ekernel|latexrelease>
 %    \end{macrocode}
 %
 %    \begin{macrocode}
@@ -1181,6 +1187,7 @@
 %   \cs{@firstoftwo} etc).
 %    \begin{macrocode}
 %</2ekernel>
+%<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2019/10/01}%
 %<latexrelease>  {\@swaptwoargs}{Don't lose the file name}%
 \long\def\@swaptwoargs#1#2{#2#1}
@@ -1253,7 +1260,6 @@
 %<latexrelease>     {\filename at area\filename at base}%
 %<latexrelease>     {\ifx\filename at ext\relax tex\else\filename at ext\fi}}%
 %<latexrelease>   \reserved at a}}
-%</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 %
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 3eb2a2fa..3dd320e9 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -2381,7 +2381,7 @@
 %    Then we add the new rule.  We need to normalize the rules here to
 %    allow for faster processing later.  Given a pair of labels
 %    $l_A$ and $l_B$, the rule $l_A>l_B$ is the same as $l_B<l_A$
-%    only presented differently.  But bynormalizing the
+%    only presented differently.  But by normalizing the
 %    forms of the rule to a single representation, say, $l_B<l_A$, reduces
 %    the time spent looking for the rules later considerably.
 %
diff --git a/base/ltmiscen.dtx b/base/ltmiscen.dtx
index 324baa89..0c115d3b 100644
--- a/base/ltmiscen.dtx
+++ b/base/ltmiscen.dtx
@@ -654,17 +654,17 @@
 %    found all this testing is no longer needed and so we redefine
 %    \cs{@execute at begin@hook} to simply use the hook.
 %    \begin{macrocode}
-\def\@execute at begin@hook #1{
+\def\@execute at begin@hook #1{%
   \expandafter\ifx\csname #1\endcsname\document
     \endgroup
-    \gdef\@execute at begin@hook##1{\UseHook{env/##1/begin}}
+    \gdef\@execute at begin@hook##1{\UseHook{env/##1/begin}}%
     \@expl@@@initialize at all@@
   \fi
 %    \end{macrocode}
 %    If this is an environment before \verb=\begin{document}= we just
 %    run the hook so this can be outside the test.
 %    \begin{macrocode}
-  \UseHook{env/#1/begin}
+  \UseHook{env/#1/begin}%
 }
 %    \end{macrocode}
 %