[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks2: renamed some internal interfaces used in other modules dropped a command no longer used in ltexpl.dtx (f16cb773)
Frank Mittelbach
frank.mittelbach at latex-project.org
Thu Aug 20 10:48:25 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : lthooks2
Link : https://github.com/latex3/latex2e/commit/f16cb7733ae35998095cfb53843dd9a627b5e520
>---------------------------------------------------------------
commit f16cb7733ae35998095cfb53843dd9a627b5e520
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Aug 20 10:48:25 2020 +0200
renamed some internal interfaces used in other modules
dropped a command no longer used in ltexpl.dtx
>---------------------------------------------------------------
f16cb7733ae35998095cfb53843dd9a627b5e520
base/ltclass.dtx | 23 ++++++++++++-----------
base/ltexpl.dtx | 34 ++++++++++------------------------
base/lthooks.dtx | 12 ++++++------
base/ltmiscen.dtx | 2 +-
4 files changed, 29 insertions(+), 42 deletions(-)
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index 7047aac1..f8bd9285 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -564,6 +564,16 @@
%<latexrelease>\IncludeInRelease{2020/10/01}{\@pushfilename}%
%<latexrelease> {Add \@expl at push@filename@@ and \@expl at push@filename at aux@@}%
\def\@pushfilename{%
+% \end{macrocode}
+% The push and pop macros are injected in \cs{@pushfilename} and
+% \cs{@popfilename} so that they correctly keep track of the hook
+% labels.
+%
+% This needs cleanup with the \pkg{expl3} interfaces also playing
+% here, e.g., \cs{@expl at push@filename@@} needs cleanup and (and
+% should probably not have this name either).
+% \begin{macrocode}
+ \@expl@@@hook at curr@name at push@@n{}%
\@expl at push@filename@@
\xdef\@currnamestack{%
{\@currname}%
@@ -594,7 +604,8 @@
%<latexrelease>
%<latexrelease>\IncludeInRelease{2020/10/01}{\@popfilename}%
%<latexrelease> {Add \@expl at pop@filename@@}%
-\def\@popfilename{\expandafter\@p at pfilename\@currnamestack\@nil
+\def\@popfilename{\@expl@@@hook at curr@name at pop@@
+ \expandafter\@p at pfilename\@currnamestack\@nil
\@expl at pop@filename@@}
%<latexrelease>\EndIncludeInRelease
%<latexrelease>
@@ -610,16 +621,6 @@
%<*2ekernel>
% \end{macrocode}
%
-% The push and pop macros are injected in \cs{@pushfilename} and
-% \cs{@popfilename} so that they correctly keep track of the hook
-% labels.
-% \fmi{Properly integrate in the kernel}
-% \begin{macrocode}
-\ExplSyntaxOn
-\tl_gput_left:Nn \@pushfilename{\@expl@@hook at curr@name at push@n{}}
-\tl_gput_left:Nn \@popfilename {\@expl@@hook at curr@name at pop@}
-\ExplSyntaxOff
-% \end{macrocode}
%
%
% \begin{macrocode}
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index 7a567e37..06a195d7 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -49,6 +49,8 @@
%</driver>
% \fi
%
+%
+%
% \section{\pkg{expl3}-dependent code}
%
% \StopEventually{}
@@ -218,11 +220,6 @@
%
% \subsection{Using expl3 code}
%
-% \begin{macrocode}
-%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease> {\@expl at tl@trim at spaces@apply@@nN}
-%<latexrelease> {l3 macro for use in include}%
-% \end{macrocode}
% In order to ease the implemantation of some new features in
% \LaTeXe\ we may (temporarily) use some coding based on the
% \pkg{expl3}-code.
@@ -232,25 +229,14 @@
% packages. These macros will always have the \verb|@expl@|
% prefix in their name.
%
-% \changes{v1.2a}{2020/05/02}
-% {Define a macro based on l3 language to support inclusion of
-% files with space in the name (gh/217)}
-% \begin{macrocode}
-\ExplSyntaxOn
-\cs_new_eq:NN \@expl at tl@trim at spaces@apply@@nN \tl_trim_spaces_apply:nN
-\ExplSyntaxOff
-% \end{macrocode}
+% The rest of the name matches the \pkg{expl3} name but with all
+% underscores replaced by \texttt{@}s and the \texttt{:} replaced
+% by \texttt{@@}, e.g.,
+%\begin{verbatim}
+% \cs_new_eq:NN \@expl at tl@trim at spaces@apply@@nN \tl_trim_spaces_apply:nN
+%\end{verbatim}
+% if that \pkg{expl3} command is needed in places that are others
+% coded in \LaTeXe{} conventions.
%
-% \begin{macrocode}
-%<latexrelease>\EndIncludeInRelease
-%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\@expl at tl@trim at spaces@apply@@nN}
-%<latexrelease> {l3 macro for use in include}%
-%<latexrelease>
-%<latexrelease>\let\@expl at tl@trim at spaces@apply@@nN\@undefined
-%<latexrelease>
-%<latexrelease>\EndIncludeInRelease
-%</2ekernel|latexrelease>
-% \end{macrocode}
%
% \Finale
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index b2e3e2c2..e5f846e5 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -3642,23 +3642,23 @@
% have to unset the \texttt{@\/@} since we want double ``at'' sign
% in place of double underscores.
%
-% \begin{macro}{\@expl@@initialize at all@,
-% \@expl@@hook at curr@name at push@n,
-% \@expl@@hook at curr@name at pop@}
+% \begin{macro}{\@expl@@initialize at all@@,
+% \@expl@@@hook at curr@name at push@@n,
+% \@expl@@@hook at curr@name at pop@@}
%
% \begin{macrocode}
%<@@=>
-\cs_new_eq:NN \@expl@@initialize at all@
+\cs_new_eq:NN \@expl@@initialize at all@@
\__hook_initialize_all:
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_eq:NN \@expl@@hook at curr@name at push@n
+\cs_new_eq:NN \@expl@@@hook at curr@name at push@@n
\__hook_curr_name_push:n
% \end{macrocode}
%
% \begin{macrocode}
-\cs_new_eq:NN \@expl@@hook at curr@name at pop@
+\cs_new_eq:NN \@expl@@@hook at curr@name at pop@@
\__hook_curr_name_pop:
% \end{macrocode}
% \end{macro}
diff --git a/base/ltmiscen.dtx b/base/ltmiscen.dtx
index 2e4ba188..8cd28966 100644
--- a/base/ltmiscen.dtx
+++ b/base/ltmiscen.dtx
@@ -657,7 +657,7 @@
\expandafter\ifx\csname #1\endcsname\document
\endgroup
\gdef\@execute at begin@hook##1{\UseHook{env/##1/begin}}
- \@expl@@initialize at all@
+ \@expl@@initialize at all@@
\fi
% \end{macrocode}
% If this is an environment before \verb=\begin{document}= we just
More information about the latex3-commits
mailing list.