[latex3-commits] [git/LaTeX3-latex3-latex2e] gh217: Update ltexpl.dtx and ltfiles.dtx to add latexrelease docstrip-tags (f5d86a82)
Johannes Braams
texniek at braams.xs4all.nl
Sun May 3 00:05:34 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : gh217
Link : https://github.com/latex3/latex2e/commit/f5d86a8278089f83eea4bd6844a8515f73957ad4
>---------------------------------------------------------------
commit f5d86a8278089f83eea4bd6844a8515f73957ad4
Author: Johannes Braams <texniek at braams.xs4all.nl>
Date: Sun May 3 00:05:34 2020 +0200
Update ltexpl.dtx and ltfiles.dtx to add latexrelease docstrip-tags
>---------------------------------------------------------------
f5d86a8278089f83eea4bd6844a8515f73957ad4
base/ltexpl.dtx | 13 +++++++++-
base/ltfiles.dtx | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
2 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index b9bc1671..a03fa151 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -139,10 +139,21 @@
\cs_new_eq:NN \@expl at tl@trim at spaces@@n \tl_trim_spaces:n
\cs_new_eq:NN \@expl at exp@args@@Ne \exp_args:Ne
\ExplSyntaxOff
+% \end{macrocode}
+%
+% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\@expl at tl@trim at spaces@@n}
+%<latexrelease> {l3 macro for use in include}%
+%<latexrelease>
+%<latexrelease>\let\@expl at tl@trim at spaces@@n\@undefined
+%<latexrelease>\let\@expl at exp@args@@Ne\@undefined
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
-% \end{macrocode}
+% \end{macrocode}
%
% \begin{macrocode}
%</2ekernel>
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index bae1cc61..d545debc 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -546,7 +546,7 @@
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2019/10/01}%
+%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\includeonly}{Spaces in file names}%
\def\includeonly#1{%
\@partswtrue
@@ -591,7 +591,7 @@
% \changes{v1.2g}{2020/05/02}{Get rid of leading and trailing spaces
% from the filename}
% \changes{v1.2g}{2020-05-02}{Pass the filename to \cs{@include} by
-% value istead of by reference}
+% value instead of by reference}
% \begin{macrocode}
\def\include#1{\relax
\ifnum\@auxout=\@partaux
@@ -607,6 +607,25 @@
% \begin{macrocode}
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2019/10/01}%
+%<latexrelease> {\includeonly}{Spaces in file names}%
+%<latexrelease>
+%<latexrelease>\def\includeonly#1{%
+%<latexrelease> \@partswtrue
+%<latexrelease> \set at curr@file{\zap at space#1 \@empty}%
+%<latexrelease> \let\@partlist\@curr at file
+%<latexrelease> }
+%<latexrelease>
+%<latexrelease>\def\include#1{\relax
+%<latexrelease> \ifnum\@auxout=\@partaux
+%<latexrelease> \@latex at error{\string\include\space cannot be nested}\@eha
+%<latexrelease> \else
+%<latexrelease> \set at curr@file{#1 }%
+%<latexrelease> \expandafter\@include\@curr at file
+%<latexrelease> \fi}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
%<latexrelease>\IncludeInRelease{0000/00/00}%
%<latexrelease> {\includeonly}{Spaces in file names}%
%<latexrelease>\def\includeonly#1{%
@@ -619,7 +638,6 @@
%<latexrelease> \else \@include#1 \fi}
%<latexrelease>
%<latexrelease>\EndIncludeInRelease
-%<*2ekernel>
% \end{macrocode}
%
@@ -627,6 +645,12 @@
% \changes{v1.2g}{2020/05/02}{Support spaces in filenames by enclosing
% the names of \texttt{.aux}-files in quotes}
% \begin{macrocode}
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease> {\includeonly}{Spaces in file names}%
+% \end{macrocode}
+%
+% \begin{macrocode}
\def\@include#1 {%
\clearpage
\if at filesw
@@ -662,6 +686,42 @@
\@nameuse{cp@#1}%
\fi
\let\@auxout\@mainaux}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\includeonly}{Spaces in file names}%
+%<latexrelease>\def\@include#1 {%
+%<latexrelease> \clearpage
+%<latexrelease> \if at filesw
+%<latexrelease> \immediate\write\@mainaux{\string\@input{#1.aux}}%
+%<latexrelease> \fi
+%<latexrelease> \@tempswatrue
+%<latexrelease> \if at partsw
+%<latexrelease> \@tempswafalse
+%<latexrelease> \edef\reserved at b{#1}%
+%<latexrelease> \@for\reserved at a:=\@partlist\do
+%<latexrelease> {\ifx\reserved at a\reserved at b\@tempswatrue\fi}%
+%<latexrelease> \fi
+%<latexrelease> \if at tempswa
+%<latexrelease> \let\@auxout\@partaux
+%<latexrelease> \if at filesw
+%<latexrelease> \immediate\openout\@partaux #1.aux
+%<latexrelease> \immediate\write\@partaux{\relax}%
+%<latexrelease> \fi
+%<latexrelease> \@input@{#1.tex}%
+%<latexrelease> \clearpage
+%<latexrelease> \@writeckpt{#1}%
+%<latexrelease> \if at filesw
+%<latexrelease> \immediate\closeout\@partaux
+%<latexrelease> \fi
+%<latexrelease> \else
+%<latexrelease> \deadcycles\z@
+%<latexrelease> \@nameuse{cp@#1}%
+%<latexrelease> \fi
+%<latexrelease> \let\@auxout\@mainaux}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
% \end{macrocode}
% \end{macro}
%
@@ -754,6 +814,7 @@
\csname\@firstofone#1\@empty\endcsname}}%
\endgroup
}
+%<latexrelease>\EndIncludeInRelease
% \end{macrocode}
% For |\include| and |\includeonly| we need a variant that removes
% any leading and trailing spaces from the filename, while leaving
@@ -761,8 +822,13 @@
% the implementaion we borrow some code from the \texttt{expl3}
% language, \textbf{\emph{beware}: this may change unannounced}/
% \begin{macrocode}
+%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease> {\includeonly}{Spaces in file names}%
\def\set at curr@file at trim@spaces#1{%
\@expl at exp@args@@Ne \set at curr@file {\@expl at tl@trim at spaces@@n {#1}}}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2019/10/01}%
+%<latexrelease> {\set at curr@file}{Quote file names}%
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -867,6 +933,7 @@
%<latexrelease>\let\quote@@name\@undefined
%<latexrelease>\let\unquote at name\@undefined
%<latexrelease>\let\set at curr@file\@undefined
+%<latexrelease>\let\set at curr@file at trim@spaces\@undefined
%<latexrelease>
%<latexrelease>\let\IfFileExists@\@undefined
%<latexrelease>
More information about the latex3-commits
mailing list.