[latex3-commits] [git/LaTeX3-latex3-latex2e] nfssaxes: use "mm" as a special default for mdseries (with matching rules (fe51a166)
Frank Mittelbach
frank.mittelbach at latex-project.org
Thu Oct 10 20:47:42 CEST 2019
Repository : https://github.com/latex3/latex2e
On branch : nfssaxes
Link : https://github.com/latex3/latex2e/commit/fe51a1661ca83218b1b1fa4c45afcf8e2c8f04cc
>---------------------------------------------------------------
commit fe51a1661ca83218b1b1fa4c45afcf8e2c8f04cc
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Oct 10 20:47:42 2019 +0200
use "mm" as a special default for mdseries (with matching rules
>---------------------------------------------------------------
fe51a1661ca83218b1b1fa4c45afcf8e2c8f04cc
base/nfssaxes.tex | 44 ++++++++++++++++++++++++++++++++++++++------
1 file changed, 38 insertions(+), 6 deletions(-)
diff --git a/base/nfssaxes.tex b/base/nfssaxes.tex
index 024694dc..56ca7dd7 100644
--- a/base/nfssaxes.tex
+++ b/base/nfssaxes.tex
@@ -85,6 +85,7 @@
\DeclareFontSeriesChangeRule {bx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {bx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {bx}{x}{bx}{}
+\DeclareFontSeriesChangeRule {bx}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -92,6 +93,7 @@
\DeclareFontSeriesChangeRule {b}{c} {bc} {b} %<-----
\DeclareFontSeriesChangeRule {b}{sb} {sb} {b} %<-----
\DeclareFontSeriesChangeRule {b}{x} {bx} {b} %<-----
+\DeclareFontSeriesChangeRule {b}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -105,6 +107,7 @@
\DeclareFontSeriesChangeRule {c}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {c}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {c}{x}{x}{m} %<-----
+\DeclareFontSeriesChangeRule {c}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -119,6 +122,7 @@
\DeclareFontSeriesChangeRule {ebc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {ebc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {ebc}{x}{ebx}{}
+\DeclareFontSeriesChangeRule {ebc}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -133,8 +137,13 @@
\DeclareFontSeriesChangeRule {ebx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {ebx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {ebx}{x}{ebx}{}
+\DeclareFontSeriesChangeRule {ebx}{mm}{m}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareFontSeriesChangeRule {eb}{c}{ebc}{}
\DeclareFontSeriesChangeRule {eb}{x}{ebx}{}
+\DeclareFontSeriesChangeRule {eb}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -149,10 +158,11 @@
\DeclareFontSeriesChangeRule {elc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {elc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {elc}{x}{elx}{}
-\DeclareFontSeriesChangeRule {elx}{b}{bx}{}
+\DeclareFontSeriesChangeRule {elc}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
+\DeclareFontSeriesChangeRule {elx}{b}{bx}{}
\DeclareFontSeriesChangeRule {elx}{c}{elc}{}
\DeclareFontSeriesChangeRule {elx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {elx}{el}{elx}{}
@@ -163,11 +173,13 @@
\DeclareFontSeriesChangeRule {elx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {elx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {elx}{x}{elx}{}
+\DeclareFontSeriesChangeRule {elx}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {el}{c}{elc}{}
\DeclareFontSeriesChangeRule {el}{x}{elx}{}
+\DeclareFontSeriesChangeRule {el}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -182,6 +194,7 @@
\DeclareFontSeriesChangeRule {lc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {lc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {lc}{x}{lx}{}
+\DeclareFontSeriesChangeRule {lc}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -196,6 +209,7 @@
\DeclareFontSeriesChangeRule {lx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {lx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {lx}{x}{lx}{}
+\DeclareFontSeriesChangeRule {lx}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -204,6 +218,7 @@
\DeclareFontSeriesChangeRule {l}{c} {lc} {l} % ? %<-----
\DeclareFontSeriesChangeRule {l}{sb} {sb} {b} % ? %<-----
\DeclareFontSeriesChangeRule {l}{x} {lx} {l} % ? %<-----
+\DeclareFontSeriesChangeRule {l}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -213,6 +228,7 @@
\DeclareFontSeriesChangeRule {m}{l} {l} {m} %<-----
\DeclareFontSeriesChangeRule {m}{sb} {sb} {b} %<-----
\DeclareFontSeriesChangeRule {m}{x} {x} {m} %<-----
+\DeclareFontSeriesChangeRule {m}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -227,6 +243,7 @@
\DeclareFontSeriesChangeRule {sbc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {sbc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {sbc}{x}{sbx}{}
+\DeclareFontSeriesChangeRule {sbc}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -241,11 +258,13 @@
\DeclareFontSeriesChangeRule {sbx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {sbx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {sbx}{x}{sbx}{}
+\DeclareFontSeriesChangeRule {sbx}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {sb}{c} {sbc} {bc} %? %<-----
\DeclareFontSeriesChangeRule {sb}{x} {sbx} {bx} %? %<-----
+\DeclareFontSeriesChangeRule {sb}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -260,6 +279,7 @@
\DeclareFontSeriesChangeRule {slc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {slc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {slc}{x}{slx}{}
+\DeclareFontSeriesChangeRule {slc}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -276,6 +296,7 @@
\DeclareFontSeriesChangeRule {slx}{x}{slx}{}
\DeclareFontSeriesChangeRule {sl}{c}{slc}{}
\DeclareFontSeriesChangeRule {sl}{x}{slx}{}
+\DeclareFontSeriesChangeRule {sl}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -290,6 +311,7 @@
\DeclareFontSeriesChangeRule {ubc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {ubc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {ubc}{x}{ubx}{}
+\DeclareFontSeriesChangeRule {sbc}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -304,11 +326,13 @@
\DeclareFontSeriesChangeRule {ubx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {ubx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {ubx}{x}{ubx}{}
+\DeclareFontSeriesChangeRule {sbx}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {ub}{c}{ubc}{}
\DeclareFontSeriesChangeRule {ub}{x}{ubx}{}
+\DeclareFontSeriesChangeRule {ub}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -323,6 +347,7 @@
\DeclareFontSeriesChangeRule {ulc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {ulc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {ulc}{x}{ulx}{}
+\DeclareFontSeriesChangeRule {ulc}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -339,6 +364,7 @@
\DeclareFontSeriesChangeRule {ulx}{x}{ulx}{}
\DeclareFontSeriesChangeRule {ul}{c}{ulc}{}
\DeclareFontSeriesChangeRule {ul}{x}{ulx}{}
+\DeclareFontSeriesChangeRule {ul}{mm}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -352,6 +378,7 @@
\DeclareFontSeriesChangeRule {x}{sl}{slx}{}
\DeclareFontSeriesChangeRule {x}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {x}{ul}{ulx}{}
+\DeclareFontSeriesChangeRule {x}{mm}{m}{}
% \end{macrocode}
%
% \emph{rules need to get completed!}
@@ -1010,11 +1037,6 @@
% format generation. Later on they may get overwritten in the
% preamble or a package via \cs{DeclareFontSeriesDefault} (or
% possibly directly).
-% \begin{macrocode}
-\edef\mdseries at rm{\mddefault}
-\edef\mdseries at sf{\mddefault}
-\edef\mdseries at tt{\mddefault}
-% \end{macrocode}
%
% Conceptual change: The \cs{bfdefault} will be \texttt{b} not
% \texttt{bx} because that is what it should be really for nearly
@@ -1036,6 +1058,16 @@
\edef\bfseries at sf{bx}
\edef\bfseries at tt{bx}
% \end{macrocode}
+%
+% We also change the default for the medium series to a virtual
+% \texttt{mm}. For this we have rules that it always reset both the
+% weight and the width.
+% \begin{macrocode}
+\renewcommand\mddefault{mm}
+\edef\mdseries at rm{\mddefault}
+\edef\mdseries at sf{\mddefault}
+\edef\mdseries at tt{\mddefault}
+% \end{macrocode}
% \end{macro}
% \end{macro}
% \end{macro}
More information about the latex3-commits
mailing list