[latex3-commits] [git/LaTeX3-latex3-latex2e] legacy-declarefontseriesdefault: fix for gh663 (d1eef49d)
Frank Mittelbach
frank.mittelbach at latex-project.org
Fri Sep 10 12:11:59 CEST 2021
Repository : https://github.com/latex3/latex2e
On branch : legacy-declarefontseriesdefault
Link : https://github.com/latex3/latex2e/commit/d1eef49d5a04bfd0b067159588b26020cdcf55b7
>---------------------------------------------------------------
commit d1eef49d5a04bfd0b067159588b26020cdcf55b7
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Fri Sep 10 12:11:59 2021 +0200
fix for gh663
>---------------------------------------------------------------
d1eef49d5a04bfd0b067159588b26020cdcf55b7
base/changes.txt | 6 +
base/doc/ltnews34.tex | 8 +
base/ltfssini.dtx | 383 +++++++++++++++------
base/testfiles/github-0306c.tlg | 4 +-
base/testfiles/github-0306d.tlg | 4 +-
base/testfiles/github-0479-often.luatex.tlg | 7 +
base/testfiles/github-0479-often.tlg | 7 +
base/testfiles/github-0479-often.xetex.tlg | 7 +
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 18 +
.../tlb-latexrelease-rollback-003-often.tlg | 18 +
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 18 +
base/testfiles/tlb-rollback-004-often.luatex.tlg | 7 +
base/testfiles/tlb-rollback-004-often.tlg | 7 +
base/testfiles/tlb-rollback-004-often.xetex.tlg | 7 +
base/testfiles/tlb-rollback-005.luatex.tlg | 7 +
base/testfiles/tlb-rollback-005.tlg | 7 +
base/testfiles/tlb-rollback-005.xetex.tlg | 7 +
17 files changed, 422 insertions(+), 100 deletions(-)
diff --git a/base/changes.txt b/base/changes.txt
index 4e98483c..25196800 100644
--- a/base/changes.txt
+++ b/base/changes.txt
@@ -6,6 +6,12 @@ completeness or accuracy and it contains some references to files that
are not part of the distribution.
================================================================================
+2021-09-10 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
+
+ * ltfssini.dtx:
+ Improve handling of legacy changes to \bfdefault or \mddefault in
+ relation to \DeclareFontSeriesDefault setting (gh/663)
+
2021-09-06 Frank Mittelbach <Frank.Mittelbach at latex-project.org>
* ltfinal.dtx (subsection{Lccodes and uccodes}):
diff --git a/base/doc/ltnews34.tex b/base/doc/ltnews34.tex
index 7b3d4156..33923fd7 100644
--- a/base/doc/ltnews34.tex
+++ b/base/doc/ltnews34.tex
@@ -511,6 +511,14 @@ the callback handler indicates to remove the entire math block.
\githubissue{644}
+\subsection{Improve handling of legacy \cs{bfdefault} changes}
+
+\emph{write}
+%
+\githubissue{663}
+
+
+
\subsection{???}
%
diff --git a/base/ltfssini.dtx b/base/ltfssini.dtx
index b06fc161..f817fdd8 100644
--- a/base/ltfssini.dtx
+++ b/base/ltfssini.dtx
@@ -36,7 +36,7 @@
%
%
\ProvidesFile{ltfssini.dtx}
- [2021/04/26 v3.2h LaTeX Kernel (NFSS Initialisation)]
+ [2021/09/10 v3.2i LaTeX Kernel (NFSS Initialisation)]
% \iffalse
\documentclass{ltxdoc}
\begin{document}
@@ -207,7 +207,7 @@
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease>\IncludeInRelease{2021/11/15}%
%<latexrelease> {\DeclareFontSeriesDefault}{Custom series}%
% \end{macrocode}
%
@@ -280,6 +280,17 @@
% \begin{macrocode}
\let\DeclareFontSeriesDefault\@undefined % for rollback
\newcommand\DeclareFontSeriesDefault[3][]{%
+% \end{macrocode}
+%
+% \changes{v3.2i}{2021/09/10}{Do delayed changes to \cs{bfdefault} or
+% \cs{mddefault} first (gh/663)}
+% \begin{macrocode}
+ \expand at font@defaults
+ \maybe at update@bfseries at defaults
+ \maybe at update@mdseries at defaults
+% \end{macrocode}
+%
+% \begin{macrocode}
\def\reserved at a{#1}%
% \end{macrocode}
% No optional argument: set up general default.
@@ -333,7 +344,77 @@
% \end{macro}
+% \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease> {\DeclareFontSeriesDefault}{Custom series}%
+%<latexrelease>
+%<latexrelease>\let\DeclareFontSeriesDefault\@undefined % for rollback
+%<latexrelease>\newcommand\DeclareFontSeriesDefault[3][]{%
+%<latexrelease> \def\reserved at a{#1}%
+%<latexrelease> \ifx\reserved at a\@empty
+%<latexrelease> \ifcsname #2series\endcsname % supported are
+%<latexrelease> % \[md/bf]default
+%<latexrelease> \expandafter\def
+%<latexrelease> \csname #2default\endcsname{#3\@empty}%
+%<latexrelease> \expandafter\def
+%<latexrelease> \csname #2default at previous\endcsname{#3\@empty}%
+%<latexrelease> \else
+%<latexrelease> \@latex at error{Wrong syntax for \string\DeclareFontSeriesDefault}%
+%<latexrelease> {Mandatory first argument must be 'md' or 'bf'.}
+%<latexrelease> \fi
+%<latexrelease> \else
+%<latexrelease> \ifcsname #2series@#1\endcsname % supported are
+%<latexrelease> % \[md/bf]series@[rm/sf/tt]
+%<latexrelease> \expandafter\edef
+%<latexrelease> \csname #2series@#1\endcsname{#3}%
+%<latexrelease> \expandafter\let
+%<latexrelease> \csname #2series@#1 at kernel\endcsname\@undefined
+%<latexrelease> \else
+%<latexrelease> \@latex at error{Wrong syntax for \string\DeclareFontSeriesDefault}%
+%<latexrelease> {Optional argument must be 'rm', 'sf', or 'tt'. \MessageBreak
+%<latexrelease> Mandatory first argument must be 'md' or 'bf'.}
+%<latexrelease> \fi
+%<latexrelease> \fi
+%<latexrelease>}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\DeclareFontSeriesDefault}{Custom series}%
+%<latexrelease>
+%<latexrelease>\let\DeclareFontSeriesDefault\@undefined
+%<latexrelease>\let\bfseries at rm\@undefined
+%<latexrelease>\let\bfseries at sf\@undefined
+%<latexrelease>\let\bfseries at tt\@undefined
+%<latexrelease>\let\bfseries at rm@kernel\@undefined
+%<latexrelease>\let\bfseries at sf@kernel\@undefined
+%<latexrelease>\let\bfseries at tt@kernel\@undefined
+%<latexrelease>\let\mdseries at rm\@undefined
+%<latexrelease>\let\mdseries at sf\@undefined
+%<latexrelease>\let\mdseries at tt\@undefined
+%<latexrelease>\expandafter\let\csname ver at mweights.sty\endcsname\@undefined
+%<latexrelease>
+%<latexrelease>\let\@meta at family@list\@undefined
+%<latexrelease>\let\prepare at family@series at update\@undefined
+%<latexrelease>\let\update at series@target at value\@undefined
+%<latexrelease>
+% \end{macrocode}
+% This is always called in \cs{document} so don't make it undefined.
+% \begin{macrocode}
+%<latexrelease>\let\init at series@setup\relax
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+% \end{macrocode}
+
+% \begin{macrocode}
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease> {\mdseries at rm}{Custom series}%
+% \end{macrocode}
% \begin{macro}{\mdseries at rm}
% \begin{macro}{\mdseries at sf}
@@ -704,9 +785,8 @@
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\DeclareFontSeriesDefault}{Custom series}%
+%<latexrelease> {\mdseries at rm}{Custom series}%
%<latexrelease>
-%<latexrelease>\let\DeclareFontSeriesDefault\@undefined
%<latexrelease>\let\bfseries at rm\@undefined
%<latexrelease>\let\bfseries at sf\@undefined
%<latexrelease>\let\bfseries at tt\@undefined
@@ -735,55 +815,11 @@
% \begin{macrocode}
%</2ekernel>
%<*2ekernel|latexrelease>
-%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease>\IncludeInRelease{2021/11/15}%
%<latexrelease> {\bfseries}{Custom series with hooks}%
% \end{macrocode}
-% \begin{macro}{\expand at font@defaults}
-% \begin{macro}{\rm at def@ult}
-% \begin{macro}{\sf at def@ult}
-% \begin{macro}{\tt at def@ult}
-% \begin{macro}{\md at def@ult}
-% \begin{macro}{\bf at def@ult}
-%
-% The family specific defaults are fully expanded, i.e., they are
-% defined via \cs{edef} inside \cs{DeclareFontSeriesDefault}.
-% However, the overall defaults, e.g., \cs{bfdefault} may have been
-% redefined by the user and thus may not be fully expanded. So to
-% enable reliable comparison we make expanded versions of
-% them. That we rerun each time. The alternative would be to only
-% allow for changes before begin document.
-% \begin{macrocode}
-\def\expand at font@defaults{%
- \edef\rmdef at ult{\rmdefault}%
- \edef\sfdef at ult{\sfdefault}%
- \edef\ttdef at ult{\ttdefault}%
-% \end{macrocode}
-% The series defaults may contain some surplus \texttt{m} that we
-% need to drop here.
-% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{bfdef at ult}
-% and \cs{mddef at ult} (gh/291)}
-% \begin{macrocode}
- \series at maybe@drop at one@m\bfdefault\bfdef at ult
- \series at maybe@drop at one@m\mddefault\mddef at ult
-% \end{macrocode}
-% Formats that set up parallel fonts, e.g., for Japanese, can use
-% this hook to add additional code here.
-% \changes{v3.1m}{2020/04/06}{Hook added (gh/306)}
-% \changes{v3.2b}{2020/08/21}{Integration of new hook management interface}
-% \begin{macrocode}
- \UseHook{expand at font@defaults}%
-}
-% \end{macrocode}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-% \end{macro}
-
-
% \begin{macro}{\bfseries}
% This document command switches to the bold series.
% \begin{macrocode}
@@ -797,9 +833,35 @@
% \cs{ttdef at ult} and the select the correct family default in that case.
% \changes{v3.1i}{2020/02/18}{Make the \cs{ifx} selection outside
% of \cs{fontseries} argument so that it is not done several times}
+% \changes{v3.2i}{2021/09/10}{Do delayed changes to \cs{bfdefault} in
+% a separate macro for better reuse (gh/663)}
% \begin{macrocode}
\expand at font@defaults
+ \maybe at update@bfseries at defaults
+% \end{macrocode}
+%
+% \begin{macrocode}
+ \ifx\f at family\rmdef at ult \fontseries\bfseries at rm
+ \else\ifx\f at family\sfdef at ult \fontseries\bfseries at sf
+ \else\ifx\f at family\ttdef at ult \fontseries\bfseries at tt
+% \end{macrocode}
+% If not \cs{bfdefault} is used.
+% \begin{macrocode}
+ \else \fontseries\bfdefault
+ \fi\fi\fi
% \end{macrocode}
+% This hook in contrast is always executed.
+% \begin{macrocode}
+ \UseHook{bfseries}%
+ \selectfont
+}
+% \end{macrocode}
+% \end{macro}
+
+
+
+% \begin{macro}{\maybe at update@bfseries at defaults}
+%
% If \cs{bfdefault} and \cs{bfdefault at previous} are different then
% the default got changed directly through the legacy interface
% (i.e., via \cs{def} or \cs{renewcommand}. In that case we reset
@@ -807,7 +869,10 @@
% the case before the new mechanism was introduced.
% \changes{v3.1k}{2020/03/19}{Support legacy use of \cs{bfdefault}
% and \cs{mddefault} (gh/306)}
+% \changes{v3.2i}{2021/09/10}{Do delayed changes to \cs{bfdefault} in
+% a separate macro for better reuse (gh/663)}
% \begin{macrocode}
+\def\maybe at update@bfseries at defaults{%
\ifx\bfdefault\bfdefault at previous\else
% \end{macrocode}
% We add \cs{@empty} and then let \cs{bfdefault at previous} to
@@ -835,28 +900,11 @@
% \begin{macrocode}
\UseHook{bfseries/defaults}%
\fi
-% \end{macrocode}
-%
-% \begin{macrocode}
- \ifx\f at family\rmdef at ult \fontseries\bfseries at rm
- \else\ifx\f at family\sfdef at ult \fontseries\bfseries at sf
- \else\ifx\f at family\ttdef at ult \fontseries\bfseries at tt
-% \end{macrocode}
-% If not \cs{bfdefault} is used.
-% \begin{macrocode}
- \else \fontseries\bfdefault
- \fi\fi\fi
-% \end{macrocode}
-% This hook in contrast is always executed.
-% \begin{macrocode}
- \UseHook{bfseries}%
- \selectfont
}
% \end{macrocode}
% \end{macro}
-
% \begin{macro}{\mdseries}
% This document command switches to the medium series.
% \changes{v3.1i}{2020/02/18}{Make the \cs{ifx} selection outside
@@ -865,10 +913,30 @@
% and \cs{mddefault} (gh/306)}
% \changes{v3.2d}{2020/09/30}{\cs{mddefault at previous} not \cs{mdseries at previous}
% (gh/395)}
+% \changes{v3.2i}{2021/09/10}{Do delayed changes to \cs{mddefault} in
+% a separate macro for better reuse (gh/663)}
% \begin{macrocode}
\DeclareRobustCommand\mdseries{%
\not at math@alphabet\mdseries\relax
\expand at font@defaults
+ \maybe at update@mdseries at defaults
+ \ifx\f at family\rmdef at ult \fontseries\mdseries at rm
+ \else\ifx\f at family\sfdef at ult \fontseries\mdseries at sf
+ \else\ifx\f at family\ttdef at ult \fontseries\mdseries at tt
+ \else \fontseries\mddefault
+ \fi\fi\fi
+ \UseHook{mdseries}%
+ \selectfont
+}
+% \end{macrocode}
+% \end{macro}
+
+% \begin{macro}{\maybe at update@mdseries at defaults}
+%
+% \changes{v3.2i}{2021/09/10}{Do delayed changes to \cs{mddefault} in
+% a separate macro for better reuse (gh/663)}
+% \begin{macrocode}
+\def\maybe at update@mdseries at defaults{%
\ifx\mddefault\mddefault at previous\else
\expandafter\def\expandafter\mddefault\expandafter{\mddefault\@empty}%
\let\mddefault at previous\mddefault
@@ -884,17 +952,161 @@
% \begin{macrocode}
\UseHook{mdseries/defaults}%
\fi
- \ifx\f at family\rmdef at ult \fontseries\mdseries at rm
- \else\ifx\f at family\sfdef at ult \fontseries\mdseries at sf
- \else\ifx\f at family\ttdef at ult \fontseries\mdseries at tt
- \else \fontseries\mddefault
- \fi\fi\fi
- \UseHook{mdseries}%
- \selectfont
}
% \end{macrocode}
% \end{macro}
+%
+% \begin{macrocode}
+%</2ekernel|latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease> {\bfseries}{Custom series with hooks}%
+%<latexrelease>
+%<latexrelease>\let\maybe at update@bfseries at defaults\@undefined
+%<latexrelease>\let\maybe at update@mdseries at defaults\@undefined
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\bfseries{%
+%<latexrelease> \not at math@alphabet\bfseries\mathbf
+%<latexrelease> \expand at font@defaults
+%<latexrelease> \ifx\bfdefault\bfdefault at previous\else
+%<latexrelease> \expandafter\def\expandafter\bfdefault
+%<latexrelease> \expandafter{\bfdefault\@empty}%
+%<latexrelease> \let\bfdefault at previous\bfdefault
+%<latexrelease> \let\bfseries at rm\bfdef at ult
+%<latexrelease> \let\bfseries at sf\bfdef at ult
+%<latexrelease> \let\bfseries at tt\bfdef at ult
+%<latexrelease> \UseHook{bfseries/defaults}%
+%<latexrelease> \fi
+%<latexrelease> \ifx\f at family\rmdef at ult \fontseries\bfseries at rm
+%<latexrelease> \else\ifx\f at family\sfdef at ult \fontseries\bfseries at sf
+%<latexrelease> \else\ifx\f at family\ttdef at ult \fontseries\bfseries at tt
+%<latexrelease> \else \fontseries\bfdefault
+%<latexrelease> \fi\fi\fi
+%<latexrelease> \UseHook{bfseries}%
+%<latexrelease> \selectfont
+%<latexrelease>}
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\mdseries{%
+%<latexrelease> \not at math@alphabet\mdseries\relax
+%<latexrelease> \expand at font@defaults
+%<latexrelease> \ifx\mddefault\mddefault at previous\else
+%<latexrelease> \expandafter\def\expandafter\mddefault\expandafter{\mddefault\@empty}%
+%<latexrelease> \let\mddefault at previous\mddefault
+%<latexrelease> \let\mdseries at rm\mddef at ult
+%<latexrelease> \let\mdseries at sf\mddef at ult
+%<latexrelease> \let\mdseries at tt\mddef at ult
+%<latexrelease> \UseHook{mdseries/defaults}%
+%<latexrelease> \fi
+%<latexrelease> \ifx\f at family\rmdef at ult \fontseries\mdseries at rm
+%<latexrelease> \else\ifx\f at family\sfdef at ult \fontseries\mdseries at sf
+%<latexrelease> \else\ifx\f at family\ttdef at ult \fontseries\mdseries at tt
+%<latexrelease> \else \fontseries\mddefault
+%<latexrelease> \fi\fi\fi
+%<latexrelease> \UseHook{mdseries}%
+%<latexrelease> \selectfont
+%<latexrelease>}
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{2020/02/02}%
+%<latexrelease> {\bfseries}{Custom series with hooks}%
+%<latexrelease>
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\bfseries{%
+%<latexrelease> \not at math@alphabet\bfseries\mathbf
+%<latexrelease> \expand at font@defaults
+%<latexrelease> \ifx\f at family\rmdef at ult \fontseries\bfseries at rm
+%<latexrelease> \else\ifx\f at family\sfdef at ult \fontseries\bfseries at sf
+%<latexrelease> \else\ifx\f at family\ttdef at ult \fontseries\bfseries at tt
+%<latexrelease> \else \fontseries\bfdefault
+%<latexrelease> \fi\fi\fi
+%<latexrelease> \selectfont
+%<latexrelease>}
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\mdseries{%
+%<latexrelease> \not at math@alphabet\mdseries\relax
+%<latexrelease> \expand at font@defaults
+%<latexrelease> \ifx\f at family\rmdef at ult \fontseries\mdseries at rm
+%<latexrelease> \else\ifx\f at family\sfdef at ult \fontseries\mdseries at sf
+%<latexrelease> \else\ifx\f at family\ttdef at ult \fontseries\mdseries at tt
+%<latexrelease> \else \fontseries\mddefault
+%<latexrelease> \fi\fi\fi
+%<latexrelease> \selectfont
+%<latexrelease>}
+%<latexrelease>
+%<latexrelease>
+% \end{macrocode}
+%
+% \begin{macrocode}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<latexrelease>\IncludeInRelease{0000/00/00}%
+%<latexrelease> {\bfseries}{Custom series with hooks}%
+%<latexrelease>
+%<latexrelease>\DeclareRobustCommand\bfseries
+%<latexrelease> {\not at math@alphabet\bfseries\mathbf
+%<latexrelease> \fontseries\bfdefault\selectfont}
+%<latexrelease>\DeclareRobustCommand\mdseries
+%<latexrelease> {\not at math@alphabet\mdseries\relax
+%<latexrelease> \fontseries\mddefault\selectfont}
+%<latexrelease>
+%<latexrelease>\EndIncludeInRelease
+%<*2ekernel>
+
+
+
+
+%</2ekernel>
+%<*2ekernel|latexrelease>
+%<latexrelease>\IncludeInRelease{2020/10/01}%
+%<latexrelease> {\expand at font@defaults}{Custom series with hooks}%
+% \end{macrocode}
+
+
+
+% \begin{macro}{\expand at font@defaults}
+% \begin{macro}{\rm at def@ult}
+% \begin{macro}{\sf at def@ult}
+% \begin{macro}{\tt at def@ult}
+% \begin{macro}{\md at def@ult}
+% \begin{macro}{\bf at def@ult}
+%
+% The family specific defaults are fully expanded, i.e., they are
+% defined via \cs{edef} inside \cs{DeclareFontSeriesDefault}.
+% However, the overall defaults, e.g., \cs{bfdefault} may have been
+% redefined by the user and thus may not be fully expanded. So to
+% enable reliable comparison we make expanded versions of
+% them. That we rerun each time. The alternative would be to only
+% allow for changes before begin document.
+% \begin{macrocode}
+\def\expand at font@defaults{%
+ \edef\rmdef at ult{\rmdefault}%
+ \edef\sfdef at ult{\sfdefault}%
+ \edef\ttdef at ult{\ttdefault}%
+% \end{macrocode}
+% The series defaults may contain some surplus \texttt{m} that we
+% need to drop here.
+% \changes{v3.1j}{2020/02/25}{Drop surplus ``m'' from \cs{bfdef at ult}
+% and \cs{mddef at ult} (gh/291)}
+% \begin{macrocode}
+ \series at maybe@drop at one@m\bfdefault\bfdef at ult
+ \series at maybe@drop at one@m\mddefault\mddef at ult
+% \end{macrocode}
+% Formats that set up parallel fonts, e.g., for Japanese, can use
+% this hook to add additional code here.
+% \changes{v3.1m}{2020/04/06}{Hook added (gh/306)}
+% \changes{v3.2b}{2020/08/21}{Integration of new hook management interface}
+% \begin{macrocode}
+ \UseHook{expand at font@defaults}%
+}
+% \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+
+
% \begin{macro}{\rmfamily}
% Here are the document level commands for changing the main font
@@ -1094,7 +1306,7 @@
%</2ekernel|latexrelease>
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{2020/02/02}%
-%<latexrelease> {\bfseries}{Custom series with hooks}%
+%<latexrelease> {\expand at font@defaults}{Custom series with hooks}%
%<latexrelease>
%<latexrelease>\def\expand at font@defaults{%
%<latexrelease> \edef\rmdef at ult{\rmdefault}%
@@ -1105,27 +1317,6 @@
%<latexrelease> \edef\famdef at ult{\familydefault}%
%<latexrelease>}
%<latexrelease>
-%<latexrelease>\DeclareRobustCommand\bfseries{%
-%<latexrelease> \not at math@alphabet\bfseries\mathbf
-%<latexrelease> \expand at font@defaults
-%<latexrelease> \ifx\f at family\rmdef at ult \fontseries\bfseries at rm
-%<latexrelease> \else\ifx\f at family\sfdef at ult \fontseries\bfseries at sf
-%<latexrelease> \else\ifx\f at family\ttdef at ult \fontseries\bfseries at tt
-%<latexrelease> \else \fontseries\bfdefault
-%<latexrelease> \fi\fi\fi
-%<latexrelease> \selectfont
-%<latexrelease>}
-%<latexrelease>
-%<latexrelease>\DeclareRobustCommand\mdseries{%
-%<latexrelease> \not at math@alphabet\mdseries\relax
-%<latexrelease> \expand at font@defaults
-%<latexrelease> \ifx\f at family\rmdef at ult \fontseries\mdseries at rm
-%<latexrelease> \else\ifx\f at family\sfdef at ult \fontseries\mdseries at sf
-%<latexrelease> \else\ifx\f at family\ttdef at ult \fontseries\mdseries at tt
-%<latexrelease> \else \fontseries\mddefault
-%<latexrelease> \fi\fi\fi
-%<latexrelease> \selectfont
-%<latexrelease>}
%<latexrelease>
%<latexrelease>\DeclareRobustCommand\rmfamily{%
%<latexrelease> \not at math@alphabet\rmfamily\mathrm
@@ -1152,7 +1343,7 @@
%<latexrelease>
%<latexrelease>\EndIncludeInRelease
%<latexrelease>\IncludeInRelease{0000/00/00}%
-%<latexrelease> {\bfseries}{Custom series with hooks}%
+%<latexrelease> {\expand at font@defaults}{Custom series with hooks}%
%<latexrelease>
%<latexrelease>\let\expand at font@defaults\@undefined
%<latexrelease>
diff --git a/base/testfiles/github-0306c.tlg b/base/testfiles/github-0306c.tlg
index 58a693ff..7f80bc3f 100644
--- a/base/testfiles/github-0306c.tlg
+++ b/base/testfiles/github-0306c.tlg
@@ -38,8 +38,8 @@ Don't change this file in any respect.
\mddefault = b
\bfdefault = sb
------
- \mddef at ult = \mddef at ult
- \bfdef at ult = \bfdef at ult
+ \mddef at ult = m
+ \bfdef at ult = sb
------
\mdseries at rm = m
\bfseries at rm = bx
diff --git a/base/testfiles/github-0306d.tlg b/base/testfiles/github-0306d.tlg
index 69d3d10e..8fd20876 100644
--- a/base/testfiles/github-0306d.tlg
+++ b/base/testfiles/github-0306d.tlg
@@ -38,8 +38,8 @@ Don't change this file in any respect.
\mddefault = m
\bfdefault = b
------
- \mddef at ult = \mddef at ult
- \bfdef at ult = \bfdef at ult
+ \mddef at ult = m
+ \bfdef at ult = b
------
\mdseries at rm = m
\bfseries at rm = sb
diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
index ec61db41..bea8d2e5 100644
--- a/base/testfiles/github-0479-often.luatex.tlg
+++ b/base/testfiles/github-0479-often.luatex.tlg
@@ -286,11 +286,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
index f0664829..4e324dc1 100644
--- a/base/testfiles/github-0479-often.tlg
+++ b/base/testfiles/github-0479-often.tlg
@@ -276,11 +276,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
index 507156b1..c2cce047 100644
--- a/base/testfiles/github-0479-often.xetex.tlg
+++ b/base/testfiles/github-0479-often.xetex.tlg
@@ -276,11 +276,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
index 08526ea1..a86f1781 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
@@ -255,9 +255,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Skipping: [....-..-..] make delimiters robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
+LaTeX Info: Redefining \bfseries on input line ....
+LaTeX Info: Redefining \mdseries on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
@@ -834,9 +843,18 @@ Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
+LaTeX Info: Redefining \bfseries on input line ....
+LaTeX Info: Redefining \mdseries on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
diff --git a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
index 223df128..cef4c98d 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.tlg
@@ -249,9 +249,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Skipping: [....-..-..] make delimiters robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
+LaTeX Info: Redefining \bfseries on input line ....
+LaTeX Info: Redefining \mdseries on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
@@ -818,9 +827,18 @@ Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
+LaTeX Info: Redefining \bfseries on input line ....
+LaTeX Info: Redefining \mdseries on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries 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 a2400483..948f4c33 100644
--- a/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
+++ b/base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
@@ -249,9 +249,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Skipping: [....-..-..] make delimiters robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
+LaTeX Info: Redefining \bfseries on input line ....
+LaTeX Info: Redefining \mdseries on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
@@ -827,9 +836,18 @@ Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
Skipping: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
+LaTeX Info: Redefining \bfseries on input line ....
+LaTeX Info: Redefining \mdseries on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.luatex.tlg b/base/testfiles/tlb-rollback-004-often.luatex.tlg
index 5fcceb4a..b17bc59c 100644
--- a/base/testfiles/tlb-rollback-004-often.luatex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.luatex.tlg
@@ -287,12 +287,19 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.tlg b/base/testfiles/tlb-rollback-004-often.tlg
index 4da91291..cf3d4ccb 100644
--- a/base/testfiles/tlb-rollback-004-often.tlg
+++ b/base/testfiles/tlb-rollback-004-often.tlg
@@ -276,12 +276,19 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/tlb-rollback-004-often.xetex.tlg b/base/testfiles/tlb-rollback-004-often.xetex.tlg
index 9f706248..bca204a7 100644
--- a/base/testfiles/tlb-rollback-004-often.xetex.tlg
+++ b/base/testfiles/tlb-rollback-004-often.xetex.tlg
@@ -276,12 +276,19 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/tlb-rollback-005.luatex.tlg b/base/testfiles/tlb-rollback-005.luatex.tlg
index e4af567c..ffec581c 100644
--- a/base/testfiles/tlb-rollback-005.luatex.tlg
+++ b/base/testfiles/tlb-rollback-005.luatex.tlg
@@ -290,11 +290,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/tlb-rollback-005.tlg b/base/testfiles/tlb-rollback-005.tlg
index 043a211e..cbdc6a81 100644
--- a/base/testfiles/tlb-rollback-005.tlg
+++ b/base/testfiles/tlb-rollback-005.tlg
@@ -280,11 +280,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
diff --git a/base/testfiles/tlb-rollback-005.xetex.tlg b/base/testfiles/tlb-rollback-005.xetex.tlg
index 01621cc3..35d7779f 100644
--- a/base/testfiles/tlb-rollback-005.xetex.tlg
+++ b/base/testfiles/tlb-rollback-005.xetex.tlg
@@ -280,11 +280,18 @@ Applying: [....-..-..] makemath accents robust on input line ....
Already applied: [....-..-..] makemath accents robust on input line ....
Applying: [....-..-..] make delimiters robust on input line ....
Already applied: [....-..-..] make delimiters robust on input line ....
+Skipping: [....-..-..] Custom series on input line ....
Applying: [....-..-..] Custom series on input line ....
Already applied: [....-..-..] Custom series on input line ....
+Applying: [....-..-..] Custom series on input line ....
+Already applied: [....-..-..] Custom series on input line ....
+Skipping: [....-..-..] Custom series with hooks on input line ....
Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \bfseries on input line ....
LaTeX Info: Redefining \mdseries on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Already applied: [....-..-..] Custom series with hooks on input line ....
+Applying: [....-..-..] Custom series with hooks on input line ....
LaTeX Info: Redefining \rmfamily on input line ....
LaTeX Info: Redefining \sffamily on input line ....
LaTeX Info: Redefining \ttfamily on input line ....
More information about the latex3-commits
mailing list.