[latex3-commits] [git/LaTeX3-latex3-latex2e] doc-fixes: minor improvements to typesetting source2e; get rid of some overfull boxes (more to do); suppress spurious l3doc warnings about using internals; (ba2d5dfb)
Frank Mittelbach
frank.mittelbach at latex-project.org
Fri Jan 15 22:35:13 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : doc-fixes
Link : https://github.com/latex3/latex2e/commit/ba2d5dfb125e26f5600679e6850aee2acb5added
>---------------------------------------------------------------
commit ba2d5dfb125e26f5600679e6850aee2acb5added
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Jan 15 22:35:13 2021 +0100
minor improvements to typesetting source2e;
get rid of some overfull boxes (more to do);
suppress spurious l3doc warnings about using internals;
>---------------------------------------------------------------
ba2d5dfb125e26f5600679e6850aee2acb5added
base/fontdef.dtx | 4 ++--
base/ltclass.dtx | 10 ++++++----
base/ltdefns.dtx | 4 ++--
base/ltdirchk.dtx | 10 +++++++---
base/ltexpl.dtx | 6 ++++--
base/ltfilehook.dtx | 20 ++++++++++++++------
base/ltfiles.dtx | 13 ++++++++-----
base/ltfinal.dtx | 7 ++++---
base/ltfssaxes.dtx | 8 +++++---
base/ltfssdcl.dtx | 6 +++---
base/ltfssini.dtx | 34 +++++++++++++++++++---------------
base/lthooks.dtx | 22 +++++++++++-----------
base/ltluatex.dtx | 6 +++++-
base/ltshipout.dtx | 20 ++++++++++++--------
base/lttextcomp.dtx | 30 ++++++++++++++++--------------
base/ltvers.dtx | 26 ++++++++++++++------------
base/source2edoc.cls | 29 +++++++++++++++++++++++++++--
17 files changed, 159 insertions(+), 96 deletions(-)
diff --git a/base/fontdef.dtx b/base/fontdef.dtx
index 21f26494..581cfeb7 100644
--- a/base/fontdef.dtx
+++ b/base/fontdef.dtx
@@ -39,7 +39,7 @@
%<driver, >\ProvidesFile{fontdef.drv}
% \fi
% \ProvidesFile{fontdef.dtx}
-%<-latexrelease> [2020/11/24 v3.0i LaTeX Kernel
+%<-latexrelease> [2021/01/15 v3.0i LaTeX Kernel
% \iftrue (\else
%<text, >(Text
%<math, >(Math
@@ -227,7 +227,7 @@
% described in \texttt{ltoutenc.dtx}.
%
% By convention, text encoding specific declarations, including the
-% declaration |\DeclareFontEncoding|, are kept in separate file of
+% |\DeclareFontEncoding| declaration, are kept in separate file of
% the form \meta{enc}\texttt{enc.def}, e.g.~\texttt{ot1enc.def}. This
% allows other applications to make use of the declarations as
% well.
diff --git a/base/ltclass.dtx b/base/ltclass.dtx
index c12ced79..01f8eba3 100644
--- a/base/ltclass.dtx
+++ b/base/ltclass.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltclass.dtx}
- [2020/12/17 v1.3v LaTeX Kernel (Class & Package Interface)]
+ [2021/01/15 v1.3v LaTeX Kernel (Class & Package Interface)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltclass.dtx}
@@ -2640,7 +2640,8 @@
% Text before the |\end|, write it with a warning.
% \begin{macrocode}
\@latex at warning{Writing text `##1' before %
- \string\end{\@currenvir}\MessageBreak as last line of \@curr at file}%
+ \string\end{\@currenvir}\MessageBreak
+ as last line of \@curr at file}%
\immediate\write\reserved at c{##1}%
\fi%
\ifx\relax##2\relax%
@@ -2675,7 +2676,8 @@
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{2019/10/01}%
-%<latexrelease> {\filec at ntents}{Spaces in file names + optional arg}%
+%<latexrelease> {\filec at ntents}{Spaces in file names + optional arg}%
+%<latexrelease>
%<latexrelease>\def\filecontents{\@tempswatrue\@fileswtrue
%<latexrelease> \@ifnextchar[\filec at ntents@opt\filec at ntents
%<latexrelease>}
@@ -2805,7 +2807,7 @@
%<latexrelease>\endgroup%
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\filec at ntents}{Spaces in file names + optional arg}%
+%<latexrelease> {\filec at ntents}{Spaces in file names + optional arg}%
%<latexrelease>
%<latexrelease>\let\filec at ntents@opt \@undefined
%<latexrelease>\let\filec at ntents@force \@undefined
diff --git a/base/ltdefns.dtx b/base/ltdefns.dtx
index 9bbd79f2..ab9d4d0d 100644
--- a/base/ltdefns.dtx
+++ b/base/ltdefns.dtx
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltdefns.dtx}
- [2020/11/25 v1.5o LaTeX Kernel (definition commands)]
+ [2021/01/15 v1.5o LaTeX Kernel (definition commands)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltdefns.dtx}
@@ -1471,7 +1471,7 @@
% \ldots
% \end{quote}
% \cs{robust at command@act} will iterate over the \meta{action-list}, evaluating
-% each \meta{if-type-$n$}\meta{robust-cmd}|{|\meta{true}|}{|\meta{false}|}|.
+% each \meta{if-type-$n$} \meta{robust-cmd} |{|\meta{true}|}{|\meta{false}|}|.
% If the \meta{if-type-$n$} conditional returns \meta{true}, then
% \meta{act-type-$n$}\meta{act-arg} is executed, and the loop ends. If the
% conditional returns \meta{false}, then \meta{if-type-$n+1$} is executed in
diff --git a/base/ltdirchk.dtx b/base/ltdirchk.dtx
index 2c47dc20..36a1ca61 100644
--- a/base/ltdirchk.dtx
+++ b/base/ltdirchk.dtx
@@ -37,7 +37,7 @@
%<*driver>
% \fi
\ProvidesFile{ltdirchk.dtx}
- [2020/12/05 v1.3a LaTeX Kernel (System Dependent Parts)]
+ [2021/01/15 v1.3a LaTeX Kernel (System Dependent Parts)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltdirchk.dtx}
@@ -127,14 +127,16 @@
% |\input at path| should expand to a list of such directories, each in a
% |{}| group.
%
+% \begin{sloppypar}
% \DescribeMacro{\filename at parse}
% After a call of the form: |\filename at parse{|\meta{filename}|}|, the
-% three macros |\filename at area|,|\filename at base|,|\filename at ext| should
+% three macros |\filename at area|, |\filename at base| and |\filename at ext| should
% be defined to be the `area' (or directory), basename and
% extension respectively. If there was no extension specified in
% \meta{filename}, |\filename at ext| should be |\let| to |\relax| (so this
% case may be tested with |\@ifundefined{filename at ext}| and, perhaps a
% default extension substituted).
+% \end{sloppypar}
%
% Normally one would not need to define this macro in |texsys.cfg| as
% the automatic tests can supply parsers that work with UNIX and VMS and
@@ -470,14 +472,16 @@
% |{}| group.
%
%
+% \begin{sloppypar}
% \DescribeMacro{\filename at parse}
% After a call of the form: |\filename at parse{|\meta{filename}|}|, the
-% three macros |\filename at area|,|\filename at base|,|\filename at ext| should
+% three macros |\filename at area|, |\filename at base|, |\filename at ext| should
% be defined to be the `area' (or directory), basename and
% extension respectively. If there was no extension specified in
% \meta{filename}, |\filename at ext| should be |\let| to |\relax| (so this
% case may be tested with |\@ifundefined{filename at ext}| and, perhaps a
% default extension substituted).
+% \end{sloppypar}
%
% Normally one would not need to define this macro in |texsys.cfg| as
% the automatic tests can supply parsers that work with UNIX and VMS
diff --git a/base/ltexpl.dtx b/base/ltexpl.dtx
index b2138761..51f8adea 100644
--- a/base/ltexpl.dtx
+++ b/base/ltexpl.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltexpl.dtx}
- [2020/12/18 v1.2h LaTeX Kernel (expl3-dependent code)]
+ [2021/01/15 v1.2h LaTeX Kernel (expl3-dependent code)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltexpl.dtx}
@@ -188,7 +188,9 @@
% In \texttt{2ekernel} mode, an error is fatal and building the format
% is aborted. Use \verb=\batchmode \read -1 to \tokenlist=, which errors
% with
-% \verb=! Emergency stop. (cannot \read from terminal in nonstop modes)=
+%\begin{verbatim}
+% ! Emergency stop. (cannot \read from terminal in nonstop modes)
+%\end{verbatim}
% and aborts the \TeX{} run. In \texttt{latexrelease} mode, raise an
% error and do nothing. Both ways, the error message shows the minimum
% \textsf{expl3} engine requirements.
diff --git a/base/ltfilehook.dtx b/base/ltfilehook.dtx
index b5b5de62..51fd0bc8 100644
--- a/base/ltfilehook.dtx
+++ b/base/ltfilehook.dtx
@@ -622,6 +622,7 @@
% When rolling forward the following expl3 functions may not be defined.
% If we roll back the code does nothing.
% \changes{v1.0d}{2020/11/24}{Support for roll forward (gh/434)}
+% \InternalDetectionOff
% \begin{macrocode}
%<latexrelease>\IncludeInRelease{2020/10/01}%
%<latexrelease> {\file_parse_full_name_apply:nN}{Roll forward help}%
@@ -643,7 +644,8 @@
%<latexrelease> {
%<latexrelease> \tl_if_empty:nTF {#3}
%<latexrelease> { \__file_parse_full_name_base:nw { } #2 . \s__file_stop {#1} }
-%<latexrelease> { \__file_parse_full_name_area:nw { #1 / #2 } #3 \s__file_stop }
+%<latexrelease> { \__file_parse_full_name_area:nw { #1 / #2 }
+%<latexrelease> #3 \s__file_stop }
%<latexrelease> }
%<latexrelease>\cs_new:Npn \__file_parse_full_name_base:nw #1 #2 . #3 \s__file_stop
%<latexrelease> {
@@ -657,7 +659,8 @@
%<latexrelease> }
%<latexrelease> { \__file_parse_full_name_tidy:nnnN {#1} { .#2 } }
%<latexrelease> }
-%<latexrelease> { \__file_parse_full_name_base:nw { #1 . #2 } #3 \s__file_stop }
+%<latexrelease> { \__file_parse_full_name_base:nw { #1 . #2 }
+%<latexrelease> #3 \s__file_stop }
%<latexrelease> }
%<latexrelease>\cs_new:Npn \__file_parse_full_name_tidy:nnnN #1 #2 #3 #4
%<latexrelease> {
@@ -675,6 +678,7 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
+% \InternalDetectionOn
%
% \begin{macrocode}
%<@@=>
@@ -897,7 +901,8 @@
@file-subst@
\@@_subst_file_normalize:Nn \use_ii_iii:nnn {#1}
}
- { \@@_subst_file_normalize:Nn \@@_file_name_compose:nnn {#2} }
+ { \@@_subst_file_normalize:Nn \@@_file_name_compose:nnn
+ {#2} }
\group_end:
}
\cs_new_protected:Npn \@@_subst_remove:n #1
@@ -1107,6 +1112,7 @@
.tex\else\string#1\fi}
% \end{macrocode}
%
+% \begin{sloppypar}
% Then we call \cs{@expl@@@filehook at set@curr at file@@nNN} once for
% \cs{@curr at file} to set \cs[no-index]{CurrentFile(Path)Used} and once for
% \cs{@curr at file@reqd} to set \cs[no-index]{CurrentFile(Path)}.
@@ -1116,6 +1122,7 @@
% \cs{@curr at file} and \cs{@curr at file@reqd} differ. This macro is
% issued separate from \cs{set at curr@file} because it changes
% \cs{CurrentFile}, and side-effects would quickly get out of control.
+% \end{sloppypar}
% \begin{macrocode}
\def\@filehook at set@CurrentFile{%
\@expl@@@filehook at set@curr at file@@nNN{\@curr at file}%
@@ -1185,7 +1192,7 @@
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease> {\@@_resolve_file_subst:w}{Replace files detect loops}%
+%<latexrelease> {\@@_resolve_file_subst:w}{Replace files detect loops}%
\ExplSyntaxOn
\cs_new:Npn \@@_resolve_file_subst:w #1 \@nil
{ \@@_file_parse_full_name:nN {#1} \@@_file_subst_begin:nnn }
@@ -1284,7 +1291,7 @@
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease> {\@@_file_subst_tortoise_hare:nn}{Tortoise and Hare}%
+%<latexrelease> {\@@_file_subst_tortoise_hare:nn}{Tortoise and Hare}%
\ExplSyntaxOn
\cs_new:Npn \@@_file_subst_tortoise_hare:nn #1 #2 #3
{
@@ -1437,7 +1444,7 @@
% \begin{macrocode}
%<@@=>
% \end{macrocode}
-%
+% \InternalDetectionOff
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
@@ -1495,6 +1502,7 @@
\cs_new_eq:NN \@expl@@@filehook at file@pop at assign@@nnnn
\__filehook_file_pop_assign:nnnn
% \end{macrocode}
+% \InternalDetectionOn
%
%
% \begin{macrocode}
diff --git a/base/ltfiles.dtx b/base/ltfiles.dtx
index 500b11f9..446ac192 100644
--- a/base/ltfiles.dtx
+++ b/base/ltfiles.dtx
@@ -32,7 +32,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfiles.dtx}
- [2020/12/04 v1.2j LaTeX Kernel (File Handling)]
+ [2021/01/15 v1.2j LaTeX Kernel (File Handling)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfiles.dtx}
@@ -458,12 +458,14 @@
% applied several times with harmful effects. We therefore
% explicitly drop it at this point. the coding is somewhat obscure
% due to the name of the macro which requires constructing.
+% \InternalDetectionOff
% \begin{macrocode}
\edef \@kernel at after@begindocument at before {%
\let\expandafter\noexpand\csname
__hook env/document/begin\endcsname
\noexpand\@empty}
% \end{macrocode}
+% \InternalDetectionOn
%
% \begin{macrocode}
\let \@kernel at before@begindocument \@empty
@@ -996,10 +998,11 @@
% A side effect of the new code is that we will see quotes around
% file name displays where there haven't been any before.
%
-% For compatibility with existing code using |{abc}.tex| or |{one.two}.png|
-% an initial brace group is discarded before expansion and |\string| is applied
-% The content of the brace group is discarded. This means that a leading space
-% will be lost unless protected (by |{ }| or |" "| or |\space|) but filenames
+% For compatibility with existing code using |{abc}.tex| or
+% |{one.two}.png|, an initial brace group is discarded before
+% expansion and |\string| is applied. The content of the brace
+% group is discarded. This means that a leading space will be lost
+% unless protected (by |{ }| or |" "| or |\space|) but filenames
% with a space are hopefully rare.
%
% \changes{v1.2a}{2019/07/01}{Support UTF-8}
diff --git a/base/ltfinal.dtx b/base/ltfinal.dtx
index 114749fd..dd68e1de 100644
--- a/base/ltfinal.dtx
+++ b/base/ltfinal.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltfinal.dtx}
- [2021/01/06 v2.2l LaTeX Kernel (Final Settings)]
+ [2021/01/15 v2.2l LaTeX Kernel (Final Settings)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltfinal.dtx}
@@ -525,12 +525,13 @@
%</2ekernel>
%<*2ekernel|latexrelease>
%<latexrelease>\IncludeInRelease{2017/04/15}%
-%<latexrelease> {\document at default@language}{Save language for hyphenation}%
+%<latexrelease> {\document at default@language}{Save language for hyphenation}%
\let\document at default@language\m at ne
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\document at default@language}{Save language for hyphenation}%
+%<latexrelease> {\document at default@language}{Save language for hyphenation}%
+%
%<latexrelease>\let\document at default@language\@undefined
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
diff --git a/base/ltfssaxes.dtx b/base/ltfssaxes.dtx
index 3ef60bc3..e0c07874 100644
--- a/base/ltfssaxes.dtx
+++ b/base/ltfssaxes.dtx
@@ -35,7 +35,7 @@
%
%
\ProvidesFile{ltfssaxes.dtx}
- [2020/12/22 v1.0h LaTeX Kernel (NFSS Axes handing)]
+ [2021/01/15 v1.0h LaTeX Kernel (NFSS Axes handing)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -764,8 +764,10 @@
%<latexrelease>\IncludeInRelease{2020/02/02}%
%<latexrelease> {\fontseries}{delay fontseries update}%
%<latexrelease>
-%<latexrelease>\DeclareRobustCommand\fontseries[1]{\@forced at seriesfalse\merge at font@series{#1}}
-%<latexrelease>\DeclareRobustCommand\fontseriesforce[1]{\@forced at seriestrue\edef\f at series{#1}}
+%<latexrelease>\DeclareRobustCommand\fontseries[1]{\@forced at seriesfalse
+%<latexrelease> \merge at font@series{#1}}
+%<latexrelease>\DeclareRobustCommand\fontseriesforce[1]{\@forced at seriestrue
+%<latexrelease> \edef\f at series{#1}}
%<latexrelease>\let\delayed at f@adjustment\@undefined
%<latexrelease>
% \end{macrocode}
diff --git a/base/ltfssdcl.dtx b/base/ltfssdcl.dtx
index cd5747e2..dd4e14fa 100644
--- a/base/ltfssdcl.dtx
+++ b/base/ltfssdcl.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfssdcl.dtx}
- [2020/12/05 v3.0v LaTeX Kernel (NFSS Declarative Interface)]
+ [2021/01/15 v3.0v LaTeX Kernel (NFSS Declarative Interface)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -1526,7 +1526,7 @@
\def\set at mathdelimiter#1#2#3#4#5#6{%
% \end{macrocode}
% We use \cs{protected} not \cs{MakeRobust} so that
-% \verb=\bigl\lfoor= etc.\ works inside \cs{protected at edef}.
+% \verb=\bigl\lfoor= etc.\ works inside the argument of \cs{protected at edef}.
% \changes{v3.0s}{2019/08/27}{Make math delimiters robust}
% \changes{v3.0t}{2020/01/20}{fix for gh/251}
% \begin{macrocode}
@@ -1733,7 +1733,7 @@
\relax
% \end{macrocode}
% If it is undefined, fine otherwise check if it is a math alphabet
-% defined via |\DeclareSymbolFontAlphabet|:
+% defined via \\ |\DeclareSymbolFontAlphabet|:
% \begin{macrocode}
\else
\edef\reserved at a{%
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index afb2b27b..361adac9 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfssini.dtx}
- [2020/12/06 v3.2f LaTeX Kernel (NFSS Initialisation)]
+ [2021/01/15 v3.2f LaTeX Kernel (NFSS Initialisation)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -448,7 +448,7 @@
% \item \cs{bfseries} is called for a family using \texttt{bx}
% (e.g., CMR)
% \item Switch to a font family that is none of the meta
-% families, e.g., via \verb=\fontfamily{ptm}\selectfont=
+% families, e.g., via \verb=\fontfamily{ptm}\allowbreak\verb=\selectfont=
% \item Then none of the real meta families, match but the final
% \verb=\@elt{??}= will.
% \item Therefore if the current series is \cs{mddefault} or
@@ -1307,8 +1307,9 @@
}
% \end{macrocode}
% \end{macro}
-
-
+%
+%
+%
% \begin{macro}{\if at font@series at context}
% The boolean to signal if we found the requested font series context.
% \begin{macrocode}
@@ -1334,9 +1335,11 @@
%<latexrelease>\EndIncludeInRelease
%<*2ekernel>
% \end{macrocode}
-
-
-
+%
+%
+%
+%
+%
%
% \section{Supporting nested emphasis}
%
@@ -1401,9 +1404,9 @@
\let\emfontdeclare at clist\@empty
% \end{macrocode}
% \end{macro}
-
-
-
+%
+%
+%
% \begin{macro}{\emrest}
% Reset the font to upright and upper/lower case. With the default rules
% using \cs{shapedefault} does that for us but to be on the safe side we
@@ -1412,12 +1415,13 @@
\DeclareRobustCommand\emreset{\upshape\ulcshape}
% \end{macrocode}
% \end{macro}
-
-
-
+%
+%
+%
% \begin{macro}{\em}
-% The new definition for \cs{em} (and implicitly \cs{emph} is like
-% it was before if \cs{emfontdeclare at clist} is empty.
+%
+% The new definition for \cs{em} (and implicitly \cs{emph}) is the
+% same as before as long as \cs{emfontdeclare at clist} is empty.
% \begin{macrocode}
\DeclareRobustCommand\em{%
\@nomath\em
diff --git a/base/lthooks.dtx b/base/lthooks.dtx
index 404938d2..037b6a71 100644
--- a/base/lthooks.dtx
+++ b/base/lthooks.dtx
@@ -32,7 +32,7 @@
%
% \begin{macrocode}
\def\lthooksversion{v1.0h}
-\def\lthooksdate{2021/01/07}
+\def\lthooksdate{2021/01/15}
% \end{macrocode}
%
%<*driver>
@@ -1336,14 +1336,8 @@
% Like \cs{AtBeginDocument} but for the \hook{enddocument} hook.
% \end{function}
%
-%
-%
-% \begin{function}{\AtBeginDvi}
-% \begin{syntax}
-% \cs{AtBeginDvi} \oarg{label} \Arg{code}
-% \end{syntax}
-% This hook is discussed in conjunction with the shipout hooks.
-% \end{function}
+% There is also \cs{AtBeginDvi} which is discussed in conjunction
+% with the shipout hooks.
%
% \bigskip
%
@@ -1772,9 +1766,11 @@
%
% \begin{macro}[EXP]{\@@_str_compare:nn}
% Private copy of \cs{__str_if_eq:nn}
+% \InternalDetectionOff
% \begin{macrocode}
\cs_new_eq:NN \@@_str_compare:nn \__str_if_eq:nn
% \end{macrocode}
+% \InternalDetectionOn
% \end{macro}
%
% \subsection{Declarations}
@@ -2898,9 +2894,11 @@
% together in hook |#1|.
% \begin{macrocode}
\cs_new_protected:cpn { @@_rule_incompatible-error_gset:nnn } #1#2#3
- { \@@_tl_gset:cn { g_@@_#1_rule_ \@@_label_pair:nn {#2} {#3} _tl } { xE } }
+ { \@@_tl_gset:cn { g_@@_#1_rule_ \@@_label_pair:nn {#2} {#3} _tl }
+ { xE } }
\cs_new_protected:cpn { @@_rule_incompatible-warning_gset:nnn } #1#2#3
- { \@@_tl_gset:cn { g_@@_#1_rule_ \@@_label_pair:nn {#2} {#3} _tl } { xW } }
+ { \@@_tl_gset:cn { g_@@_#1_rule_ \@@_label_pair:nn {#2} {#3} _tl }
+ { xW } }
% \end{macrocode}
% \end{macro}
%
@@ -4449,6 +4447,7 @@
% \begin{macro}{\@expl@@@initialize at all@@,
% \@expl@@@hook at curr@name at pop@@}
%
+% \InternalDetectionOff
% \begin{macrocode}
\cs_new_eq:NN \@expl@@@initialize at all@@
\__hook_initialize_all:
@@ -4458,6 +4457,7 @@
\cs_new_eq:NN \@expl@@@hook at curr@name at pop@@
\__hook_curr_name_pop:
% \end{macrocode}
+% \InternalDetectionOn
% \end{macro}
%
%
diff --git a/base/ltluatex.dtx b/base/ltluatex.dtx
index 8689e9f3..0dec294b 100644
--- a/base/ltluatex.dtx
+++ b/base/ltluatex.dtx
@@ -28,7 +28,7 @@
\ProvidesFile{ltluatex.dtx}
%</driver>
%<*tex>
-[2020/12/06 v1.1s
+[2021/01/15 v1.1s
%</tex>
%<plain> LuaTeX support for plain TeX (core)
%<*tex>
@@ -204,6 +204,7 @@
% The number is returned and also \meta{name} argument is added to the
% |lua.name| array at that index.
%
+% \begin{sloppypar}
% \noindent
% \DescribeMacro{new_luafunction}
% |luatexbase.new_luafunction(|\meta{functionname}|)|\\
@@ -211,6 +212,7 @@
% with |\luafunction|, |\lateluafunction|, and |\luadef|,
% indexed from~$1$. The optional \meta{functionname} argument
% is just used for logging.
+% \end{sloppypar}
%
% These functions all require access to a named \TeX{} count register
% to manage their allocations. The standard names are those defined
@@ -1116,6 +1118,7 @@ luatexbase.registernumber = registernumber
% \changes{v1.1c}{2017/02/18}{Parameterize count used in tracking}
% As attributes are used for Lua manipulations its useful to be able
% to assign from this end.
+% \InternalDetectionOff
% \begin{macrocode}
local attributes=setmetatable(
{},
@@ -1143,6 +1146,7 @@ local function new_attribute(name)
end
luatexbase.new_attribute = new_attribute
% \end{macrocode}
+% \InternalDetectionOn
% \end{macro}
%
% \subsection{Custom whatsit allocation}
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 2ea0a1b6..00ea4be1 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -32,7 +32,7 @@
%
% \begin{macrocode}
\providecommand\ltshipoutversion{v1.0d}
-\providecommand\ltshipoutdate{2020/12/06}
+\providecommand\ltshipoutdate{2021/01/15}
% \end{macrocode}
%
%<*driver>
@@ -769,7 +769,7 @@
% \begin{macrocode}
\@@_execute_firstpage_hook:
% \end{macrocode}
-% The we check if we have to add the \hook{shipout/lastpage} hook
+% Then we check if we have to add the \hook{shipout/lastpage} hook
% or the corresponding kernel hook
% because we have reached the last page. This test will be false for
% all but one (and hopefully the correct) page.
@@ -780,9 +780,10 @@
{ \hook_if_empty_p:n {shipout/lastpage} }
{ \tl_if_empty_p:N \@kernel at after@shipout at lastpage }
{ \@@_debug:n { \typeout{Executing~ lastpage~ hook~
- on~ page~ \int_use:N \g_shipout_readonly_int } }
- \_@@_add_foreground_box:n { \UseHook{shipout/lastpage}
- \@kernel at after@shipout at lastpage }
+ on~ page~ \int_use:N \g_shipout_readonly_int } }
+ \_@@_add_foreground_box:n
+ { \UseHook{shipout/lastpage}
+ \@kernel at after@shipout at lastpage }
}
\bool_gset_true:N \g_@@_lastpage_handled_bool
}
@@ -911,8 +912,8 @@
\dim_set:Nn \l_shipout_box_ht_dim { \box_ht:N #1 }
\dim_set:Nn \l_shipout_box_dp_dim { \box_dp:N #1 }
\dim_set:Nn \l_shipout_box_wd_dim { \box_wd:N #1 }
- \dim_set:Nn \l_shipout_box_ht_plus_dp_dim { \l_shipout_box_ht_dim +
- \l_shipout_box_dp_dim }
+ \dim_set:Nn \l_shipout_box_ht_plus_dp_dim
+ { \l_shipout_box_ht_dim + \l_shipout_box_dp_dim }
}
% \end{macrocode}
% \end{macro}
@@ -1442,7 +1443,8 @@
% defined so we better not use \cs{cs_new_protected:Npn} here.
% \changes{v1.0d}{2020/11/24}{Support for roll forward (gh/434)}
% \begin{macrocode}
-\cs_set_protected:Npn \AtBeginDvi {\@@_add_firstpage_material:Nn \AtBeginDvi}
+\cs_set_protected:Npn \AtBeginDvi
+ {\@@_add_firstpage_material:Nn \AtBeginDvi}
% \end{macrocode}
% \end{macro}
%
@@ -1471,6 +1473,7 @@
% \@expl@@@shipout at add@foreground at picture@@n}
% Some internals needed elsewhere.
%
+% \InternalDetectionOff
% \begin{macrocode}
\cs_set_eq:NN \@expl@@@shipout at add@firstpage at material@@Nn
\__shipout_add_firstpage_material:Nn
@@ -1495,6 +1498,7 @@
\cs_set_eq:NN \@expl@@@shipout at add@foreground at picture@@n
\__shipout_add_foreground_picture:n
% \end{macrocode}
+% \InternalDetectionOn
% \end{macro}
%
% \begin{macrocode}
diff --git a/base/lttextcomp.dtx b/base/lttextcomp.dtx
index c63009dc..f52eee9c 100644
--- a/base/lttextcomp.dtx
+++ b/base/lttextcomp.dtx
@@ -33,7 +33,7 @@
%
%
\ProvidesFile{lttextcomp.dtx}
- [2020/12/05 v1.0d LaTeX Kernel (text companion symbols)]
+ [2021/01/15 v1.0d LaTeX Kernel (text companion symbols)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -362,13 +362,14 @@
}
% \end{macrocode}
% \end{macro}
-
-
-
-
+%
+%
+%
+%
+%
% \begin{macro}{\tc at fake@euro}
% |\tc at fake@euro| is an example of a ``fake'' definition to use in arg |#3| of
-% |\CheckEncodingSubset| when a symbol is not available in a
+% the command |\CheckEncodingSubset| when a symbol is not available in a
% certain font family. Here we produce a poor man's Euro symbol by combining
% a ``C'' with a ``=''.
% \begin{macrocode}
@@ -386,10 +387,10 @@
}
% \end{macrocode}
% \end{macro}
-
-
-
-
+%
+%
+%
+%
% \begin{macro}{\tc at check@symbol}
% \begin{macro}{\tc at check@accent}
% These are two abbreviations that we use below to check symbols
@@ -415,7 +416,8 @@
% \end{macrocode}
%
% \begin{macrocode}
-\def\tc at check@accent#1{\CheckEncodingSubset\UseTextAccent{TS1}{\tc at swap@accent#1}}
+\def\tc at check@accent#1{\CheckEncodingSubset\UseTextAccent
+ {TS1}{\tc at swap@accent#1}}
\def\tc at swap@accent#1#2{\UseTextAccent{T1}#1}
% \end{macrocode}
% \end{macro}
@@ -430,17 +432,17 @@
%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textdollar}{TS1}
-\UndeclareTextCommand{\textdollar} {OT1} % don't use the OT1 def any longer
+\UndeclareTextCommand{\textdollar}{OT1} % don't use the OT1 def any longer
% \end{macrocode}
%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textsterling}{TS1}
-\UndeclareTextCommand{\textsterling}{OT1} % don't use the OT1 def any longer
+\UndeclareTextCommand{\textsterling}{OT1} % don't use the OT1 def any longer
% \end{macrocode}
%
% \begin{macrocode}
\DeclareTextSymbolDefault{\textperthousand}{TS1}
-\UndeclareTextCommand{\textperthousand}{T1} % don't use the T1 def
+\UndeclareTextCommand{\textperthousand}{T1} % don't use the T1 def
% \end{macrocode}
% Using \cs{UndeclareTextCommand} above is enough only if the
% encoding definition files are not reloaded afterwards. In the
diff --git a/base/ltvers.dtx b/base/ltvers.dtx
index 74d6f418..b073fd9e 100644
--- a/base/ltvers.dtx
+++ b/base/ltvers.dtx
@@ -33,7 +33,7 @@
%<*driver>
% \fi
\ProvidesFile{ltvers.dtx}
- [2020/12/05 v1.1e LaTeX Kernel (Version Info)]
+ [2021/01/15 v1.1e LaTeX Kernel (Version Info)]
% \iffalse
\documentclass{ltxdoc}
\GetFileInfo{ltvers.dtx}
@@ -181,28 +181,30 @@
% \begin{macrocode}
\ifnum0\ifnum\patch at level=0 \ifx\development at branch@name\@empty 1\fi\fi>0 %
\everyjob\expandafter{\the\everyjob
- \typeout{\fmtname \space<\fmtversion>}}
+ \typeout{\fmtname\space <\fmtversion>}}
\immediate
\write16{\fmtname \space<\fmtversion>}
\else\ifnum\patch at level>0
\everyjob\expandafter{\the\everyjob
- \typeout{\fmtname \space<\fmtversion> patch level \patch at level}}
+ \typeout{\fmtname\space <\fmtversion> patch level \patch at level}}
\immediate
- \write16{\fmtname \space<\fmtversion> patch level \patch at level}
+ \write16{\fmtname\space <\fmtversion> patch level \patch at level}
\else
\everyjob\expandafter{\the\everyjob
- \typeout{\fmtname \space<\fmtversion> pre-release-\number-\patch at level\space
- \ifx\development at branch@name\@undefined \else
- \ifx\development at branch@name\@empty \else
- \space (\development at branch@name\space branch)%
+ \typeout{\fmtname\space <\fmtversion>
+ pre-release-\number-\patch at level\space
+ \ifx\development at branch@name\@undefined \else
+ \ifx\development at branch@name\@empty \else
+ \space (\development at branch@name\space branch)%
\fi
\fi
}}
\immediate
- \write16{\fmtname \space<\fmtversion> pre-release-\number-\patch at level\space
- \ifx\development at branch@name\@undefined \else
- \ifx\development at branch@name\@empty \else
- \space (\development at branch@name\space branch)%
+ \write16{\fmtname\space <\fmtversion>
+ pre-release-\number-\patch at level\space
+ \ifx\development at branch@name\@undefined \else
+ \ifx\development at branch@name\@empty \else
+ \space (\development at branch@name\space branch)%
\fi
\fi
}
diff --git a/base/source2edoc.cls b/base/source2edoc.cls
index e0610823..ba6acf9f 100644
--- a/base/source2edoc.cls
+++ b/base/source2edoc.cls
@@ -2,7 +2,7 @@
% This class is buggy and needs fixing
\ProvidesClass{source2edoc}
- [2020/12/02 v0.2 Quick hack to typeset source2.tex
+ [2021/01/14 v0.2b Quick hack to typeset source2.tex
(not usable for anything else and buggy -- will vanish again)!]
\LoadClass{l3doc}
@@ -106,6 +106,31 @@
\fi
\cs_set_eq:NN \@auxout \@mainaux
}
+
+
+% change the setup here: we have a lot of long names so better run raggeded
+
+\cs_set_protected:Npn \__codedoc_macro_end_style:n #1
+ {
+ \nobreak \noindent
+ { \raggedright\hangindent1pc \footnotesize ( \emph{#1} ) \par }
+ }
+
+
+% next two declarations should move to l3doc.cls in the l3kernel eventually
+% they should be ``new'' not ``set'' but to avoid getting in timing issues
+% when they will be officially defined we use ``set'' here
+
+\cs_set_eq:NN \__codedoc_saved_detect_internals:N \__codedoc_detect_internals:N
+
+% maybe this change should be local so that it automatically reverts on \verb=\end{macro}=
+% without the need to explicitly turn it on again.
+
+\cs_new_protected:Npn \InternalDetectionOff
+ { \cs_gset_eq:NN \__codedoc_detect_internals:N \use_none:n }
+\cs_new_protected:Npn \InternalDetectionOn
+ { \cs_gset_eq:NN \__codedoc_detect_internals:N \__codedoc_saved_detect_internals:N }
+
\ExplSyntaxOff
\def\partname{File}
@@ -257,7 +282,7 @@ Bug reports can be opened (category \texttt{#1}) at\\%
{}
-%\errorstopmode
+\errorstopmode
\batchmode
\endinput
More information about the latex3-commits
mailing list.