[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Update ltfssbas.dtx, ltfssini.dtx, and 8 more files... to remove typos found in #428, #429 (fc215298)

Sun Dec 6 15:34:09 CET 2020

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/fc21529831347365e02d7eea93d8fc636d03783f

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

commit fc21529831347365e02d7eea93d8fc636d03783f
Author: Johannes Braams <texniek at braams.xs4all.nl>
Date:   Sun Dec 6 15:34:09 2020 +0100

    Update ltfssbas.dtx, ltfssini.dtx, and 8 more files... to remove typos found in #428, #429


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

fc21529831347365e02d7eea93d8fc636d03783f
 base/ltfssbas.dtx                                  | 26 +++++++--------
 base/ltfssini.dtx                                  | 38 +++++++++++-----------
 base/ltmiscen.dtx                                  |  8 ++---
 base/ltshipout.dtx                                 |  6 ++--
 .../tlb-latexrelease-rollback-003-often.luatex.tlg | 20 ++++++------
 .../tlb-latexrelease-rollback-003-often.tlg        | 20 ++++++------
 .../tlb-latexrelease-rollback-003-often.xetex.tlg  | 20 ++++++------
 base/testfiles/tlb-rollback-004-often.luatex.tlg   | 10 +++---
 base/testfiles/tlb-rollback-004-often.tlg          | 10 +++---
 base/testfiles/tlb-rollback-004-often.xetex.tlg    | 10 +++---
 10 files changed, 84 insertions(+), 84 deletions(-)

diff --git a/base/ltfssbas.dtx b/base/ltfssbas.dtx
index 4a6afca3..681c735c 100644
--- a/base/ltfssbas.dtx
+++ b/base/ltfssbas.dtx
@@ -35,7 +35,7 @@
 %
 %
 \ProvidesFile{ltfssbas.dtx}
-             [2020/02/27 v3.2g LaTeX Kernel (NFSS Basic Macros)]
+             [2020/12/05 v3.2g LaTeX Kernel (NFSS Basic Macros)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -1384,7 +1384,7 @@
 %    The idea for this macro is stolen from the \texttt{substitutefont}
 %    package by Günter Milde, with some modifications and a new name.
 %
-%    Its purpose is to provide characters in a special encoding tht
+%    Its purpose is to provide characters in a special encoding that
 %    are not available in the current font family to be taken from a
 %    different family that is visually compatible (or not if you
 %    choose badly). For example, you can match the GFS Didot Greek
@@ -1403,7 +1403,7 @@
 %</2ekernel>
 %<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2020/02/02}%
-%<latexrelease>       {\DeclareFontFamilySubstitution}{Provide family substituation}%
+%<latexrelease>       {\DeclareFontFamilySubstitution}{Provide family substitution}%
 \begingroup
 \nfss at catcodes
 \gdef\DeclareFontFamilySubstitution#1#2#3{%
@@ -1413,7 +1413,7 @@
 %    is better to handle that differently.
 %
 %    Of course the families  may still need loading at
-%    this point and so we arange for this. Otherwise we might run into
+%    this point and so we arrange for this. Otherwise we might run into
 %    trouble because the necessary \cs{DeclareFontFamily} has not been
 %    seen.
 %    \begin{macrocode}
@@ -1457,7 +1457,7 @@
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease>      {\DeclareFontFamilySubstitution}{Provide family substituation}%
+%<latexrelease>      {\DeclareFontFamilySubstitution}{Provide family substitution}%
 %<latexrelease>
 %<latexrelease>\let\DeclareFontFamilySubstitution\@undefined
 %<latexrelease>\EndIncludeInRelease
@@ -1484,11 +1484,11 @@
           \noexpand\@nil}%
 %    \end{macrocode}
 %    Initialize all those internal variables which may or may not have
-%    values in the first seconds of NFSS' bootstraping process. Later
+%    values in the first seconds of NFSS' bootstrapping process. Later
 %    on such values will be updated when an encoding is selected, etc.
 %
 %    We definitely don't want to set |\f at encoding|; we can set all the
-%    others since if they are left ``blank'' any selection would grap
+%    others since if they are left ``blank'' any selection would grab
 %    ``error default values'' as well. However, this probably should
 %    go also---and now it did.
 % \changes{v2.1n}{1994/05/14}{Don't set \cs{f at encoding}}
@@ -1540,7 +1540,7 @@
 %    \begin{macrocode}
 %</2ekernel>
 %<latexrelease>\IncludeInRelease{2015/01/01}{\wrong at fontshape}%
-%<latexrelease>                 {Font substituation in preamble}%
+%<latexrelease>                 {Font substitution in preamble}%
 %<*2ekernel|latexrelease>
 \def\wrong at fontshape{%
     \csname D@\f at encoding\endcsname   % install defaults if in math
@@ -1581,9 +1581,9 @@
 %    corresponding \texttt{.fd} file may not been loaded
 %    yet. Therefore we try this now. Otherwise equating the requested
 %    font shape with the finally selected fontshape below will fail
-%    and can result in ``NFSS tables corruped''. After begin document
+%    and can result in ``NFSS tables corrupted''. After begin document
 %    that will not happen as all \texttt{.fd} files involved in
-%    substituation are loaded at |\begin{document}|.
+%    substitution are loaded at |\begin{document}|.
 %    \begin{macrocode}
            \begingroup
               \try at load@fontshape
@@ -1662,7 +1662,7 @@
 %</2ekernel|latexrelease>
 %<latexrelease>\EndIncludeInRelease
 %<latexrelease>\IncludeInRelease{0000/00/00}{\wrong at fontshape}%
-%<latexrelease>                 {Font substituation in preamble}%
+%<latexrelease>                 {Font substitution in preamble}%
 %<latexrelease>\def\wrong at fontshape{%
 %<latexrelease>    \csname D@\f at encoding\endcsname
 %<latexrelease>    \edef\reserved at a{\csname\curr at fontshape\endcsname}%
@@ -1837,7 +1837,7 @@
 %    it modifies the corresponding macro |\mv@|\meta{version}
 %    so that it calls |\getanddefine at fonts| directly in future as well.
 %    We use the macro |\extract at alph@from at version| to do this.
-%    It takes the math alphabet identifer |#1| and the math version
+%    It takes the math alphabet identifier |#1| and the math version
 %    macro as arguments.
 % \changes{v1.9a}{1992/07/26}{}
 %    \begin{macrocode}
@@ -1925,7 +1925,7 @@
               \use at mathgroup##1{#2}}}%
 %    \end{macrocode}
 % \changes{v2.1t}{1994/10/15}{Warn if math alpha is used outside math}
-%    In addtion it defines the alphabet the way it should be used from
+%    In addition it defines the alphabet the way it should be used from
 %    now on.
 %    \begin{macrocode}
        \gdef#3{\relax\ifmmode \else \non at alpherr#3\fi
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index fbea725c..1f78218b 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -36,7 +36,7 @@
 %
 %
 \ProvidesFile{ltfssini.dtx}
-             [2020/10/08 v3.2e LaTeX Kernel (NFSS Initialisation)]
+             [2020/12/06 v3.2e LaTeX Kernel (NFSS Initialisation)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -56,7 +56,7 @@
 %
 % \GetFileInfo{ltfssini.dtx}
 % \title{A new font selection scheme for \TeX{} macro packages\\
-%        (Initialisation)\thanks
+%        (Initialization)\thanks
 %       {This file has version number
 %       \fileversion\ dated \filedate}}
 %
@@ -83,7 +83,7 @@
 % \changes{v3.1d}{2019/08/27}{Make various commands robust}
 %
 %
-% \section{NFSS Initialisation}
+% \section{NFSS Initialization}
 %
 % \iffalse
 %<+checkmem>\CHECKMEM
@@ -301,7 +301,7 @@
     \else
 %    \end{macrocode}
 %
-% \changes{v3.1g}{2020/02/05}{Clarrified error text}
+% \changes{v3.1g}{2020/02/05}{Clarified error text}
 %    \begin{macrocode}
        \@latex at error{Wrong syntax for \string\DeclareFontSeriesDefault}%
           {Mandatory first argument must be 'md'  or 'bf'.}
@@ -431,7 +431,7 @@
 %<+debug> \series at change@debug{No series preparation (forced \f at series)\on at line}%
    \fontfamily#2%
  \else
-%<+debug> \series at change@debug{Prepearing for switching to #1 (#2)\on at line}%
+%<+debug> \series at change@debug{Preparing for switching to #1 (#2)\on at line}%
    \expand at font@defaults
 %    \end{macrocode}
 %    We prepare for changing the current series. We have to find it
@@ -493,7 +493,7 @@
 %    \end{macrocode}
 %    The \cs{target at series@value} may contain something like
 %    \texttt{cm} (coming from a default) and so we can't directly
-%    asign it to \cs{f at series} be have to drop any surplus \texttt{m}
+%    assign it to \cs{f at series} be have to drop any surplus \texttt{m}
 %    first.
 % \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from
 %                             \cs{target at series@value} (gh/291)}
@@ -513,7 +513,7 @@
 %    In this macro used in the look you basically find the nested
 %    \cs{ifx}s from the outline above. The only difference is that is
 %    it is parameterized instead of being written out and only for one
-%    block of tests because the code is called reatedly when looping
+%    block of tests because the code is called repeatedly when looping
 %    over the meta family list. From the list we get each meta family
 %    name in turn.
 %    \begin{macrocode}
@@ -665,7 +665,7 @@
 %    the now current series value (in \cs{f at series}).
 %
 %    But what should happen if \cs{seriesdefault} got explicitly
-%    changed?  In that case the explicit change should surive and we
+%    changed?  In that case the explicit change should survive and we
 %    should not alter \cs{seriesdefault}. This is solved by comparing
 %    the current value of \cs{seriesdefault} with a kernel version
 %    saved in the format and if they differ we do not call
@@ -915,9 +915,9 @@
 %\end{verbatim}
 %    We have to do the testing while the current family is still
 %    unchanged but we have to do the adjustment of the series after it
-%    got changed (because the new family might has different sets
-%    ofshapes available and we certainly don't want to see
-%    substituation going on. So we use \cs{target at series@value} to
+%    got changed (because the new family might have different sets
+%    of shapes available and we certainly don't want to see
+%    substitution going on. So we use \cs{target at series@value} to
 %    hold the target series (if any).
 %\begin{verbatim}
 %  \let\target at series@value\@empty
@@ -1183,7 +1183,7 @@
 %    to different NFSS axis values it becomes important to have the
 %    ability to determine the current context as we can no longer look
 %    at \cs{f at series} to answer a question such as ``am I currently
-%    typsetting in a bold typeface?''
+%    typesetting in a bold typeface?''
 %
 %    This is provided by the test \cs{IfFontSeriesContextTF}. It takes
 %    three arguments:
@@ -1221,7 +1221,7 @@
 \DeclareRobustCommand\IfFontSeriesContextTF[1]{%
   \expand at font@defaults
 %    \end{macrocode}
-%    In the beginning we haven't found the context we are loking for.
+%    In the beginning we haven't found the context we are looking for.
 %    \begin{macrocode}
   \@font at series@contextfalse
 %    \end{macrocode}
@@ -1238,7 +1238,7 @@
   \expandafter\edef\csname ??def at ult\endcsname{\f at family}%
 %    \end{macrocode}
 %    Then we run through the meta family list (currently containing
-%    just the three values) followed by the artifical meta family
+%    just the three values) followed by the artificial meta family
 %    \texttt{??} and test each of them in turn using
 %    \cs{test at font@series at context} as the testing command.
 %    \begin{macrocode}
@@ -1264,7 +1264,7 @@
 
 %  \begin{macro}{\test at font@series at context}
 %    This tests the context (stored in \cs{requested at test@context})
-%    and updates the bookean if the right context is found.
+%    and updates the boolean if the right context is found.
 %    \begin{macrocode}
 \def\test at font@series at context#1{%
 %    \end{macrocode}
@@ -1343,10 +1343,10 @@
 %    By default \LaTeXe{} supports two levels of nested emphasis: if
 %    the current font has an upright shape then it switches to
 %    \cs{itshape} otherwise to \cs{eminnershape} (which defaults to
-%    \cs{upshape}). This means nested emphasis will ocssilate between
+%    \cs{upshape}). This means nested emphasis will oscillate between
 %    italic and upright shapes.
 %
-%    Sometimes it would be nice to allow for a more lengthly sequence,
+%    Sometimes it would be nice to allow for a more lengthy sequence,
 %    but instead of providing a fixed one \LaTeX{} now offers a
 %    general mechanism that allows to define arbitrary sequences.
 %
@@ -1377,7 +1377,7 @@
 %  \begin{macro}{\DeclareEmphSequence}
 %
 %    \cs{DeclareEmphSequence} expects a clist of declaration. Spaces in the
-%    argument are dropped to avoid surious spaces in the output. The
+%    argument are dropped to avoid spurious spaces in the output. The
 %    declarations are additive. At the very end the shape is reset
 %    using |\emreset| and |\emforce| so that this case is never
 %    skipped.\footnote{Maybe we should not add \cs{emforce} but allow
@@ -1479,7 +1479,7 @@
 %    \begin{macrocode}
   \expandafter\ifx\csname \curr at fontshape/\f at size\em at force
 %    \end{macrocode}
-%    For the comparison with \cs{ifx} we have to exand
+%    For the comparison with \cs{ifx} we have to expand
 %    \cs{em at currfont} once as the relevant info is inside.
 %    \begin{macrocode}
                           \expandafter\endcsname
diff --git a/base/ltmiscen.dtx b/base/ltmiscen.dtx
index 2cf445c8..4bb73eb8 100644
--- a/base/ltmiscen.dtx
+++ b/base/ltmiscen.dtx
@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltmiscen.dtx}
-             [2020/10/26 v1.1x LaTeX Kernel (Misc. Environments)]
+             [2020/12/06 v1.1x LaTeX Kernel (Misc. Environments)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltmiscen.dtx}
@@ -491,7 +491,7 @@
 %  \begin{macro}{\protected at file@percent}
 %    Dummy cs to be replaced by a percent sign inside
 %    \cs{@writefile}. If it survives (when used incorrectly) it will
-%    expand to nothing in a typsetting context.
+%    expand to nothing in a typesetting context.
 % \changes{v1.1n}{2018/09/26}{Sometimes mask the endline char when
 %    writing to files (github/73)}
 %    \begin{macrocode}
@@ -1060,7 +1060,7 @@
 %</2ekernel>
 %<*2ekernel|latexrelease>
 %<latexrelease>\IncludeInRelease{2020/10/01}%
-%<latexrelease>                 {\centering}{Set finaldhypendemerits}%
+%<latexrelease>                 {\centering}{Set finalhyphendemerits}%
 %    \end{macrocode}
 %
 % \begin{macro}{\centering}
@@ -1387,7 +1387,7 @@
     \let\@xobeysp\asciispace
   \else
 %    \end{macrocode} Otherwise we measure the width of a character in
-%   the mon-spaced current font and place a
+%   the mono-spaced current font and place a
 %   |\verbvisiblespace| into a box of the right width which we are then
 %   using as the character for a space. By default this will be the space
 %   character from OT1 cmtt but by changing
diff --git a/base/ltshipout.dtx b/base/ltshipout.dtx
index 08d2da5f..28f4b976 100644
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@ -32,7 +32,7 @@
 %
 %    \begin{macrocode}
 \providecommand\ltshipoutversion{v1.0c}
-\providecommand\ltshipoutdate{2020/11/03}
+\providecommand\ltshipoutdate{2020/12/06}
 %    \end{macrocode}
 %
 %<*driver>
@@ -1235,7 +1235,7 @@
 %
 %  \begin{macro}{\g_shipout_totalpages_int,\c at totalpages}
 %    We count every shipout attempt (even those that are discarded) in
-%    tis counter. It is not used in the code but may get used in user
+%    this counter. It is not used in the code but may get used in user
 %    code.
 %    \begin{macrocode}
 \int_new:N \g_shipout_totalpages_int
@@ -1535,7 +1535,7 @@
 %    \end{macrocode}
 %    We do not undo a substitution when rolling back. As the file
 %    support gets undone the underlying data is no longer used (and
-%    sufficiently obscure that should not interfere with existing
+%    sufficiently obscure that it should not interfere with existing
 %    commands) and properly removing it would mean we need to make the
 %    \cs{unclare at ...} and its support macros available in all earlier
 %    kernel releases which is pointless (and actually worse).
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index e13e7d98..413a426d 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -358,12 +358,12 @@ Skipping: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Skipping: [....-..-..] Loading .fd files on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
-Skipping: [....-..-..] Provide family substituation on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
+Skipping: [....-..-..] Provide family substitution on input line ....
+Applying: [....-..-..] Provide family substitution on input line ....
 Skipping: [....-..-..] No side effects please on input line ....
 Applying: [....-..-..] No side effects please on input line ....
-Skipping: [....-..-..] Font substituation in preamble on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
+Skipping: [....-..-..] Font substitution in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
 Skipping: [....-..-..] XeTeX support for \showhyphens  on input line ....
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 Skipping: [....-..-..] Series change rules on input line ....
@@ -395,7 +395,7 @@ Skipping: [....-..-..] Make robust on input line ....
 Applying: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Skipping: [....-..-..] Make commands robust on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 Skipping: [....-..-..] Disable hyphenation in verbatim on input line ....
@@ -863,12 +863,12 @@ Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Skipping: [....-..-..] Loading .fd files on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
-Skipping: [....-..-..] Provide family substituation on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
+Skipping: [....-..-..] Provide family substitution on input line ....
+Applying: [....-..-..] Provide family substitution on input line ....
 Applying: [....-..-..] No side effects please on input line ....
 Already applied: [....-..-..] No side effects please on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
-Already applied: [....-..-..] Font substituation in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
+Already applied: [....-..-..] Font substitution in preamble on input line ...
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 LaTeX Info: Redefining \showhyphens on input line ....
 Already applied: [....-..-..] XeTeX support for \showhyphens  on input line ....
@@ -902,7 +902,7 @@ Skipping: [....-..-..] Make robust on input line ....
 Applying: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 LaTeX Info: Redefining \centering on input line ....
 LaTeX Info: Redefining \raggedright on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 3b86babc..baef9421 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -356,12 +356,12 @@ Skipping: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Skipping: [....-..-..] Loading .fd files on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
-Skipping: [....-..-..] Provide family substituation on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
+Skipping: [....-..-..] Provide family substitution on input line ....
+Applying: [....-..-..] Provide family substitution on input line ....
 Skipping: [....-..-..] No side effects please on input line ....
 Applying: [....-..-..] No side effects please on input line ....
-Skipping: [....-..-..] Font substituation in preamble on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
+Skipping: [....-..-..] Font substitution in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
 Skipping: [....-..-..] XeTeX support for \showhyphens  on input line ....
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 Skipping: [....-..-..] Series change rules on input line ....
@@ -393,7 +393,7 @@ Skipping: [....-..-..] Make robust on input line ....
 Applying: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Skipping: [....-..-..] Make commands robust on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 Skipping: [....-..-..] Disable hyphenation in verbatim on input line ....
@@ -855,12 +855,12 @@ Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Skipping: [....-..-..] Loading .fd files on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
-Skipping: [....-..-..] Provide family substituation on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
+Skipping: [....-..-..] Provide family substitution on input line ....
+Applying: [....-..-..] Provide family substitution on input line ....
 Applying: [....-..-..] No side effects please on input line ....
 Already applied: [....-..-..] No side effects please on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
-Already applied: [....-..-..] Font substituation in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
+Already applied: [....-..-..] Font substitution in preamble on input line ...
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 LaTeX Info: Redefining \showhyphens on input line ....
 Already applied: [....-..-..] XeTeX support for \showhyphens  on input line ....
@@ -894,7 +894,7 @@ Skipping: [....-..-..] Make robust on input line ....
 Applying: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 LaTeX Info: Redefining \centering on input line ....
 LaTeX Info: Redefining \raggedright on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
index bb381e1e..1095a886 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -356,12 +356,12 @@ Skipping: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Skipping: [....-..-..] Loading .fd files on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
-Skipping: [....-..-..] Provide family substituation on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
+Skipping: [....-..-..] Provide family substitution on input line ....
+Applying: [....-..-..] Provide family substitution on input line ....
 Skipping: [....-..-..] No side effects please on input line ....
 Applying: [....-..-..] No side effects please on input line ....
-Skipping: [....-..-..] Font substituation in preamble on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
+Skipping: [....-..-..] Font substitution in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
 Skipping: [....-..-..] XeTeX support for \showhyphens  on input line ....
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 Skipping: [....-..-..] Series change rules on input line ....
@@ -393,7 +393,7 @@ Skipping: [....-..-..] Make robust on input line ....
 Applying: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Skipping: [....-..-..] Make commands robust on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 Skipping: [....-..-..] Disable hyphenation in verbatim on input line ....
@@ -864,12 +864,12 @@ Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Skipping: [....-..-..] Loading .fd files on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
-Skipping: [....-..-..] Provide family substituation on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
+Skipping: [....-..-..] Provide family substitution on input line ....
+Applying: [....-..-..] Provide family substitution on input line ....
 Applying: [....-..-..] No side effects please on input line ....
 Already applied: [....-..-..] No side effects please on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
-Already applied: [....-..-..] Font substituation in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
+Already applied: [....-..-..] Font substitution in preamble on input line ...
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 LaTeX Info: Redefining \showhyphens on input line ....
 Already applied: [....-..-..] XeTeX support for \showhyphens  on input line ....
@@ -903,7 +903,7 @@ Skipping: [....-..-..] Make robust on input line ....
 Applying: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 LaTeX Info: Redefining \centering on input line ....
 LaTeX Info: Redefining \raggedright on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 1763d015..1ace5b7e 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -744,12 +744,12 @@ Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
 Already applied: [....-..-..] Loading .fd files on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
-Already applied: [....-..-..] Provide family substituation on input line ...
+Applying: [....-..-..] Provide family substitution on input line ....
+Already applied: [....-..-..] Provide family substitution on input line ...
 Applying: [....-..-..] No side effects please on input line ....
 Already applied: [....-..-..] No side effects please on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
-Already applied: [....-..-..] Font substituation in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
+Already applied: [....-..-..] Font substitution in preamble on input line ...
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 LaTeX Info: Redefining \showhyphens on input line ....
 Already applied: [....-..-..] XeTeX support for \showhyphens  on input line ....
@@ -790,7 +790,7 @@ Applying: [....-..-..] Make robust on input line ....
 Already applied: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 LaTeX Info: Redefining \centering on input line ....
 LaTeX Info: Redefining \raggedright on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 9ddc4ea9..5adb0b92 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -742,12 +742,12 @@ Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
 Already applied: [....-..-..] Loading .fd files on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
-Already applied: [....-..-..] Provide family substituation on input line ...
+Applying: [....-..-..] Provide family substitution on input line ....
+Already applied: [....-..-..] Provide family substitution on input line ...
 Applying: [....-..-..] No side effects please on input line ....
 Already applied: [....-..-..] No side effects please on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
-Already applied: [....-..-..] Font substituation in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
+Already applied: [....-..-..] Font substitution in preamble on input line ...
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 LaTeX Info: Redefining \showhyphens on input line ....
 Already applied: [....-..-..] XeTeX support for \showhyphens  on input line ....
@@ -788,7 +788,7 @@ Applying: [....-..-..] Make robust on input line ....
 Already applied: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 LaTeX Info: Redefining \centering on input line ....
 LaTeX Info: Redefining \raggedright on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 8e5f23a7..1af90ca7 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -742,12 +742,12 @@ Applying: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Already applied: [....-..-..] Arbitrary units in \DeclareMathSizes  on input line ....
 Applying: [....-..-..] Loading .fd files on input line ....
 Already applied: [....-..-..] Loading .fd files on input line ....
-Applying: [....-..-..] Provide family substituation on input line ....
-Already applied: [....-..-..] Provide family substituation on input line ...
+Applying: [....-..-..] Provide family substitution on input line ....
+Already applied: [....-..-..] Provide family substitution on input line ...
 Applying: [....-..-..] No side effects please on input line ....
 Already applied: [....-..-..] No side effects please on input line ....
-Applying: [....-..-..] Font substituation in preamble on input line ....
-Already applied: [....-..-..] Font substituation in preamble on input line ....
+Applying: [....-..-..] Font substitution in preamble on input line ....
+Already applied: [....-..-..] Font substitution in preamble on input line ...
 Applying: [....-..-..] XeTeX support for \showhyphens  on input line ....
 LaTeX Info: Redefining \showhyphens on input line ....
 Already applied: [....-..-..] XeTeX support for \showhyphens  on input line ....
@@ -788,7 +788,7 @@ Applying: [....-..-..] Make robust on input line ....
 Already applied: [....-..-..] Make robust on input line ....
 Skipping: [....-..-..] centering, etc support calc on input line ....
 Applying: [....-..-..] centering, etc support calc on input line ....
-Skipping: [....-..-..] Set finaldhypendemerits on input line ....
+Skipping: [....-..-..] Set finalhyphendemerits on input line ....
 Applying: [....-..-..] Make commands robust on input line ....
 LaTeX Info: Redefining \centering on input line ....
 LaTeX Info: Redefining \raggedright on input line ....



