Skip to content

Commit

Permalink
Merge branch 'develop' into tlc3-errata
Browse files Browse the repository at this point in the history
  • Loading branch information
FrankMittelbach committed Oct 11, 2023
2 parents f58042c + 8d7f2a2 commit 6e3a3e3
Show file tree
Hide file tree
Showing 50 changed files with 3,490 additions and 1,798 deletions.
8 changes: 4 additions & 4 deletions base/lthooks.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
%
% \begin{macrocode}
\def\lthooksversion{v1.1f}
\def\lthooksdate{2023/08/11}
\def\lthooksdate{2023/10/02}
% \end{macrocode}
%
%<*driver>
Expand Down Expand Up @@ -795,7 +795,7 @@
% \end{itemize}
% There can only be a single relation between two labels for a
% given hook,
% i.e., a later \cs{DeclareHookrule} overwrites any previous
% i.e., a later \cs{DeclareHookRule} overwrites any previous
% declaration.
%
% The \meta{hook} and \meta{label} can be specified using the
Expand Down Expand Up @@ -1566,8 +1566,8 @@
%
% Generic hooks defined in this way are always normal hooks (i.e.,
% you can't implement reversed hooks this way). This is a
% deliberate limitation, because it speeds up the processessing
% conciderably.
% deliberate limitation, because it speeds up the processing
% considerably.
%
%
% \subsection{Hooks with arguments}
Expand Down
2 changes: 1 addition & 1 deletion base/source2edoc.cls
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
\seq_if_empty:NF \g__codedoc_nested_names_seq
{
% This is a crude change: we grab the first name
\__codedoc_get_hyper_target:xN
\__codedoc_get_hyper_target:eN
{ \seq_item:Nn \g__codedoc_nested_names_seq { 1 } }
\l__codedoc_tmpa_tl
% ... and check if it has a reference
Expand Down
8 changes: 4 additions & 4 deletions base/testfiles/github-0479-often.luatex.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -877,14 +877,14 @@ Applying: [....-..-..] UTF-8 default on input line ....
Already applied: [....-..-..] UTF-8 default on input line ....
)
> \__kernel_chk_if_free_cs:N=\protected\long macro:
#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
l. ...\show \__kernel_chk_if_free_cs:N
> \e@alloc=macro:
#1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
l. ...\show \e@alloc
> \__kernel_msg_error:nnx=\protected\long macro:
#1->\msg_error:nnx {LaTeX/#1}.
l. ...\show \__kernel_msg_error:nnx
> \__kernel_msg_error:nne=\protected\long macro:
#1->\msg_error:nne {LaTeX/#1}.
l. ...\show \__kernel_msg_error:nne
> \msg_new:nnnn=\protected\long macro:
#1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
l. ...\show \msg_new:nnnn
Expand Down
2 changes: 1 addition & 1 deletion base/testfiles/github-0479-often.lvt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
\makeatletter\ExplSyntaxOn
\show \__kernel_chk_if_free_cs:N
\show \e@alloc
\show \__kernel_msg_error:nnx
\show \__kernel_msg_error:nne
\show \msg_new:nnnn
\show \NewDocumentCommand
\show \newcommand
Expand Down
8 changes: 4 additions & 4 deletions base/testfiles/github-0479-often.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -1302,14 +1302,14 @@ Now handling font encoding U ...
Already applied: [....-..-..] UTF-8 default on input line ....
)
> \__kernel_chk_if_free_cs:N=\protected\long macro:
#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
l. ...\show \__kernel_chk_if_free_cs:N
> \e@alloc=macro:
#1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
l. ...\show \e@alloc
> \__kernel_msg_error:nnx=\protected\long macro:
#1->\msg_error:nnx {LaTeX/#1}.
l. ...\show \__kernel_msg_error:nnx
> \__kernel_msg_error:nne=\protected\long macro:
#1->\msg_error:nne {LaTeX/#1}.
l. ...\show \__kernel_msg_error:nne
> \msg_new:nnnn=\protected\long macro:
#1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
l. ...\show \msg_new:nnnn
Expand Down
8 changes: 4 additions & 4 deletions base/testfiles/github-0479-often.xetex.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -874,14 +874,14 @@ Applying: [....-..-..] UTF-8 default on input line ....
Already applied: [....-..-..] UTF-8 default on input line ....
)
> \__kernel_chk_if_free_cs:N=\protected\long macro:
#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
l. ...\show \__kernel_chk_if_free_cs:N
> \e@alloc=macro:
#1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
l. ...\show \e@alloc
> \__kernel_msg_error:nnx=\protected\long macro:
#1->\msg_error:nnx {LaTeX/#1}.
l. ...\show \__kernel_msg_error:nnx
> \__kernel_msg_error:nne=\protected\long macro:
#1->\msg_error:nne {LaTeX/#1}.
l. ...\show \__kernel_msg_error:nne
> \msg_new:nnnn=\protected\long macro:
#1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
l. ...\show \msg_new:nnnn
Expand Down
2 changes: 1 addition & 1 deletion base/testfiles/github-0944.tlg
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ LaTeX Warning: Reference `unknown' on page 1 undefined on input line ....
] (github-0944.aux)
***********
-formatname- <-formatversion-> pre-release-2 (-release-version-test- branch)
L3 programming layer <2023-08-29>
L3 programming layer <2023-10-10>
***********
*File List*
-show the file list here-
Expand Down
12 changes: 6 additions & 6 deletions required/tools/afterpage.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{afterpage}
%<package> [2014/10/28 v1.08 After-Page Package (DPC)]
%<package> [2023/07/04 v1.08 After-Page Package (DPC)]
%
%<*driver>
\documentclass{ltxdoc}
Expand Down Expand Up @@ -199,7 +199,7 @@
\global\setbox\@ne\lastbox}%
% \end{macrocode}
% If the text that is saved in |\AP@partial| had footnotes, we'd
% better grab them as well otherwise they may come out on a page
% better grab them as well, otherwise they may come out on a page
% with the `afterpage' text, before the page that has the
% footnote mark! (Added at v1.08.)
% \begin{macrocode}
Expand All @@ -218,7 +218,7 @@
% \end{macrocode}
%
% Restore the |\everydisplay| register. |\ignorespaces| prevents a space
% or newline after |$$| creating rogue a indentation or paragraph.
% or newline after |$$| creating a rogue indentation or paragraph.
% \begin{macrocode}
\def\AP@ed{\everydisplay\expandafter{\the\toks@}\ignorespaces}
% \end{macrocode}
Expand Down Expand Up @@ -264,7 +264,7 @@
% `afterpage' commands, so just add the new commands to the end of the
% list. Otherwise save the commands in |\AP@|. (within a local group),
% and switch the output routine. (The new output routine just calls the
% old one if it is invoked by a \LaTeX{} float.
% old one if it is invoked by a \LaTeX{} float.)
% \begin{macrocode}
\long\def\afterpage#1{%
\ifx\AP@\relax
Expand All @@ -291,7 +291,7 @@
\global\output\expandafter{\the\AP@output}%
\AP@clearpage
% \end{macrocode}
% At this point (since v1.08) Need to clear |\AP@| \emph{before}
% At this point (since v1.08) need to clear |\AP@| \emph{before}
% using its expansion, as otherwise hit an infinite loop. Sigh.
% \begin{macrocode}
\global\expandafter\let\expandafter\AP@\expandafter\relax
Expand Down Expand Up @@ -350,7 +350,7 @@
% \end{macrocode}
% Subtract the new height of |#1| from |\skip@|, and add back on
% |\splittopskip|, so |\skip@| is now the height of the first row of
% |#1| This may still be 0pt if (eg) a mark or whatsit is between the
% |#1|. This may still be 0pt if (eg) a mark or whatsit is between the
% top glue and the first box. Save (this height${}-{}$|\splittopskip|)
% in |\skip\tw@|.
% \begin{macrocode}
Expand Down
63 changes: 32 additions & 31 deletions required/tools/bm.dtx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
%<driver>\ProvidesFile{bm.drv}
% \fi
% \ProvidesFile{bm.dtx}
[2022/01/05 v1.2f Bold Symbol Support (DPC/FMi)]
[2023/07/08 v1.2f Bold Symbol Support (DPC/FMi)]
%
% \iffalse
%<*driver>
Expand Down Expand Up @@ -97,7 +97,7 @@
%
% If there is a `heavy' math version defined (usually accessed by a
% user-command |\heavymath|) then a similar command |\hm|
% is defined which access these `ultra bold' fonts. Currently this is
% is defined which accesses these `ultra bold' fonts. Currently this is
% probably only useful with the `mathtime plus' font collection.
% Definitions of commands that use these fonts may be made by
% specifying the optional argument `heavy' to |\DeclareBoldMathCommand|.
Expand Down Expand Up @@ -140,7 +140,7 @@
% your font set.
%
% \section{Features}
% In most cases this package should work in a fairly self explanatory
% In most cases this package should work in a fairly self-explanatory
% way, but there are some things that might not be obvious.
%
% \subsection{Interaction with Math Alphabet Commands}
Expand Down Expand Up @@ -209,7 +209,7 @@
% Normally if a command takes arguments the full command, including
% any arguments, should be included in |\bm|.
%
% So |\bm{\overbrace{abc}}| (producing \smash{$\bm{\overbrace{abc}}$})
% So |\bm{\overbrace{abc}}| (producing \smash{$\bm{\overbrace{abc}}$}),
% not
% |\bm{\overbrace}{abc}|. If you do not include all the arguments you
% will typically get the error message:\\
Expand Down Expand Up @@ -245,7 +245,7 @@
% allocations.
%
% If no bold font appears to be available for a particular symbol,
% |\bm| will use `poor man's bold' that is, overprinting the same
% |\bm| will use `poor man's bold', which will overprint the same
% character in slightly offset
% positions to give an appearance of boldness.
%
Expand All @@ -255,8 +255,8 @@
% font set there are suitable fonts for bold and heavy math setting,
% and so |\bm| and |\hm| work well. Similarly in the basic Lucida
% New Math font set there are no bold math fonts, so |\bm| will
% use `poor man's bold. However if the Lucida Expert set is used,
% Then |\bm| will detect, and use the bold math fonts that are
% use `poor man's bold'. However, if the Lucida Expert set is used,
% then |\bm| will detect, and use, the bold math fonts that are
% available.
%
% As discussed above, one may set |\bmmax| higher or lower than its
Expand Down Expand Up @@ -310,7 +310,7 @@
% ``poor man's bold''. That is, over-printing the character with slight offsets.
% Since version 1.2e, the package now warns if a font is set up to use this over-printing and
% the package option |nopbm| is available which prevents its use in which case |\bm| will
% use the non-bold for characters from the affected font,
% use the non-bold for characters from the affected font.
%
% \MaybeStop{}
%
Expand Down Expand Up @@ -339,7 +339,7 @@
%
% \changes{v1.2e}{2021/04/25}
% {Package options gh/71}
% Options to use or not use poor mans bold (over-printing)
% Options to use or not use poor man's bold (over-printing)
% and level of warning messages.
% \begin{macrocode}
%<*package>
Expand Down Expand Up @@ -399,7 +399,7 @@
% code, which is temporarily defined to |\bm|, to save wasting a csname.
% Similarly |\bm@pmb|\ldots\ (which will be defined later) are used
% as scratch macros.
% (This csname saving no longer used, setup command is |\bm@setup| not |\bm|).
% (This csname saving no longer used, setup command is |\bm@setup|, not |\bm|.)
%
% The general plan. Run through the fonts allocated to the normal math
% version. Ignore \meta{math alphabet} allocations\footnote{For now?}
Expand Down Expand Up @@ -505,11 +505,11 @@
\ifx\bm@pmb@\@firstofone\else, using \string\pmb\fi}%
\else
% \end{macrocode}
% Else make a new name by adjoining |#1| to the name of the symbol font
% Else make a new name by adjoining |#1| to the name of the symbol font,
% eg, |\symboldsymbols| to match |\symsymbols|. If that font has already
% been allocated, or if |\@tempcnta| is positive so we can allocate a
% new slot for this font, then the table will be
% set with the offset between the two fonts. otherwise set the offset to
% set with the offset between the two fonts. Otherwise set the offset to
% zero (so |\boldmath| will be used to access the font).
% \begin{macrocode}
\edef\@tempa{sym#1\expandafter\@gobblefour\string##1}%
Expand Down Expand Up @@ -673,8 +673,8 @@
\fi
% \end{macrocode}
%
% If there is no bold math version, It is very easy to set up
% the table, no need to use all the tricky code above.
% If there is no bold math version, it is very easy to set up
% the table since there is no need to use all the tricky code above.
% Also, at the end of the package redefine the internal macro
% that |\bm| uses to call |\boldmath|, to use poor man's bold
% instead.
Expand Down Expand Up @@ -711,7 +711,7 @@
%
% \begin{macro}{\hmmax}
%
% Same for heavy (but default to three this time (enough for mathtime
% Same for heavy, but default to three this time (enough for mathtime
% plus, as no heavy operators font).
% \begin{macrocode}
\ifx\hmmax\@undefined
Expand Down Expand Up @@ -777,7 +777,7 @@
\let\protect\@empty
\let\@typeset@protect\@empty
% \end{macrocode}
% Set up either bold or heavy
% Set up either bold or heavy.
% \begin{macrocode}
\def\bm@mathchoice{\bm@m@thchoice#1}%
\def\bm@group{\bm@gr@up#1}%
Expand Down Expand Up @@ -848,9 +848,9 @@
\let\next@\copy
\global\let\bm@first\@empty
% \end{macrocode}
% For AMS version of |\sqrt|: don't expand just wrap in brace group
% so that it can be made bold in a safe but slow way. Do the same for
% internal accent command
% For AMS version of |\sqrt|: don't expand, just wrap it in a brace
% group so that it can be made bold in a safe but slow way. Do the same
% for internal accent command.
% \changes{v1.1b}{2003/10/05}{AMS \cs{sqrt} not working}
%
% \changes{v1.1c}{2004/02/26}{\cs{accentV} made safe (pr/3625)}
Expand Down Expand Up @@ -886,7 +886,7 @@
% |\mv@bold| or |\mv@heavy| and we execute that after redefining
% |\install@mathalphabet| and |\getanddefine@fonts| suitably.
% The definitions are reverted back to their original the moment
% the scanning is done
% the scanning is done.
% \changes{v1.0h}{2002/11/22}{Get math alphabets right (pr/3476)}
% \begin{macrocode}
\let\install@mathalphabet\def
Expand Down Expand Up @@ -972,7 +972,7 @@
% |\bm| is empty within the definition, so that either\\
% |\bmdefine\balpha{\bm\alpha}| or |\bmdefine\balpha{\alpha}| \\
% may be used. (The former just for compatibility with the original
% version for plain \TeX).
% version for plain \TeX.)
% \begin{macrocode}
\def\bmdefine{\DeclareBoldMathCommand[bold]}
% \end{macrocode}
Expand Down Expand Up @@ -1092,8 +1092,8 @@
% \begin{macro}{\bm@gr@up}
% \changes{v1.0c}{1997/10/09}
% {Extra brace around argument for \cs{over}}
% If faced with a group,
% If we are in math mode, stick it in a |\boldsymbol| like construct
% If faced with a group
% when we are in math mode, put it in a |\boldsymbol|-like construct
% and then recurse on |\bm@expand|.
% Otherwise just use |\bfseries\boldmath|.
% The actual test is deferred till `run time'.
Expand Down Expand Up @@ -1131,15 +1131,15 @@
% Other things just copy straight over to the command being built.
% (Anything inside a |\mathop| or similar will end up being made bold
% as the |\mathop| will be copied over, but its argument will be made
% bold by the group code above.
% bold by the group code above.)
% \begin{macrocode}
\def\bm@test@token#1{%
\let\bm@next\@empty
% \end{macrocode}
%
% Stop here. Note that it is vital that the terminating token
% is non-expandable and defined, rather than the usual \LaTeX\
% terminators |\@nil| or |\@@|. (Worse still would be a `quark'
% terminators |\@nil| and |\@@|. (Worse still would be a `quark'
% like |docstrip|'s |\qStop|.)
% \begin{macrocode}
\ifx#1\@@end
Expand All @@ -1166,7 +1166,7 @@
\afterassignment\bm@radical\count@
% \end{macrocode}
%
% Need to trap spaces otherwise digits will get turned to bold
% Need to trap spaces, otherwise digits will get turned to bold
% mathchars.
% \changes{v1.1a}{2003/09/01}{Forgotten to check for \cs{hskip} (pr/3572)}
% \begin{macrocode}
Expand Down Expand Up @@ -1451,7 +1451,7 @@
% \begin{macro}{\bm@pmb@}
% \changes{v0.10}{1997/01/04}
% {Macro added}
% |\pmb| variant. (See \TeX{}Book, or AMS \textsf{amsbsy} package).
% |\pmb| variant. (See \TeX{}book, or AMS \textsf{amsbsy} package.)
% This one takes a bit more care to use smaller offsets in subscripts.
% \begin{macrocode}
\ifx\bm@pmb@\@firstofone\else
Expand Down Expand Up @@ -1544,7 +1544,7 @@
\def\bm@mathaccent{%
\bm@changefam{}%
% \end{macrocode}
% The next four lines were added a v1.0e. Without them |\bm{\hat{A}}|
% The next four lines were added in v1.0e. Without them |\bm{\hat{A}}|
% makes the accent bold using |\bm| but the group |{A}| is made bold
% via a |\mathchoice| construction as for any other group, as |\bm|
% does not attempt to parse inside brace groups. While that produces
Expand Down Expand Up @@ -1674,9 +1674,10 @@
% \begin{macro}{\bm@changefam}
% \changes{v0.10}{1997/01/04}
% {Rewrite for new \cs{bm@table} system}
% Pull out one specified hex digit and passes
% it to |\bm@modify| to change. argument is empty normally but |000| to
% access the second math group in a delimiter code.
% Pull out one specified hex digit and pass
% it to |\bm@modify| to change. Its one argument is normally empty,
% but it will be |000| when necessary to access the second math group
% in a delimiter code.
% \begin{macrocode}
\def\bm@changefam#1{%
\@tempcnta\count@
Expand Down

0 comments on commit 6e3a3e3

Please sign in to comment.