latex (28feb20)

git-svn-id: svn://tug.org/texlive/trunk@53958 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 28 insertions, 8 deletions

diff --git a/Master/texmf-dist/source/latex/base/ltfssbas.dtx b/Master/texmf-dist/source/latex/base/ltfssbas.dtx
index fedfcb68ec8..f51d742d466 100644
--- a/Master/texmf-dist/source/latex/base/ltfssbas.dtx
+++ b/Master/texmf-dist/source/latex/base/ltfssbas.dtx
@@ -35,7 +35,7 @@
 %
 %
 \ProvidesFile{ltfssbas.dtx}
-             [2020/02/24 v3.2f LaTeX Kernel (NFSS Basic Macros)]
+             [2020/02/27 v3.2g LaTeX Kernel (NFSS Basic Macros)]
 % \iffalse
 \documentclass{ltxdoc}
 \begin{document}
@@ -266,18 +266,38 @@
    \expandafter\ifx\csname #1+#2\endcsname\relax
      \@latex@error{Font family `#1+#2' unknown}\@eha
    \else
-     \expandafter
-       \xdef\csname#1/#2/%
 %    \end{macrocode}
 %    If the series value is incorrectly specified with an extra ``m'',
 %    e.g., ``mc'' instead of just ``c'', drop the surplus ``m'' but
-%    keep the ``m'' if it is by its own.
-% \changes{v3.2f}{2020/12/24}{Drop surplus ``m'' in series when
+%    keep the ``m'' if it is by its own. In that case also issue a
+%    warning that the declaration needs correction.
+% \changes{v3.2f}{2020/02/24}{Drop surplus ``m'' in series when
 %                             defining fontshape (gh/289)}
+% \changes{v3.2g}{2020/02/27}{Only ``m'' if the series value is a member
+%     of a fixed list  and issue warning if doing it (gh/293)}
+%
+%    For this we compare the given value \verb=#3= with one where we
+%    may have dropped an ``m''. If nothing has changes,
+%    fine. Otherwise there was a wrong value which is now corrected in
+%    \cs{reservedb} so we use that and also issue a warning.
+%    \begin{macrocode}
+     \edef\reserved@a{#3}%
+     \expandafter\series@maybe@drop@one@m\expandafter{#3}\reserved@b
+     \ifx\reserved@a\reserved@b\else
+       \@latex@warning{Font shape declaration has incorrect series
+         value `#3'.\MessageBreak It should not contain an `m'!
+         Please correct it.\MessageBreak Found}%
+     \fi
+     \expandafter
+       \xdef\csname#1/#2/\reserved@b/#4\endcsname
+                 {\expandafter\noexpand\csname #5\endcsname}%
+%
+%    \end{macrocode}
+%    Most of the time \verb=#6= is empty so using \cs{let} to
+%    \cs{@empty} saves on space compared to using \cs{def}. That's
+%    really one of the old space saving techniques and probably not
+%    necessary these days.
 %    \begin{macrocode}
-       \expandafter\series@drop@one@m #3mm\series@drop@one@m/%
-       #4\endcsname{\expandafter\noexpand
-                                   \csname #5\endcsname}%
      \def\reserved@a{#6}%
      \global
      \expandafter\let\csname#5\expandafter\endcsname