[latex3-commits] [git/LaTeX3-latex3-latex2e] nfssaxes: change of approach: use m ?m and m? for series (95e62e4c)
Frank Mittelbach
frank.mittelbach at latex-project.org
Thu Oct 10 22:29:04 CEST 2019
Repository : https://github.com/latex3/latex2e
On branch : nfssaxes
Link : https://github.com/latex3/latex2e/commit/95e62e4cc3a0caa42655eee758bcd40c3df7e1a5
>---------------------------------------------------------------
commit 95e62e4cc3a0caa42655eee758bcd40c3df7e1a5
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Oct 10 22:29:04 2019 +0200
change of approach: use m ?m and m? for series
>---------------------------------------------------------------
95e62e4cc3a0caa42655eee758bcd40c3df7e1a5
base/nfssaxes.tex | 119 +++++++++++++++++++++++++++++-------------------------
1 file changed, 64 insertions(+), 55 deletions(-)
diff --git a/base/nfssaxes.tex b/base/nfssaxes.tex
index 56ca7dd7..d43560d4 100644
--- a/base/nfssaxes.tex
+++ b/base/nfssaxes.tex
@@ -46,7 +46,7 @@
% or vize versa. But maybe this is overkill and \cs{bfseries} and
% \cs{mdseries} is all that people need in practice.}
%
-% \emph{explain rationale}
+% \emph{explain rationale and m?/?m syntax}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {bc}{b}{bc}{}
@@ -54,12 +54,13 @@
\DeclareFontSeriesChangeRule {bc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {bc}{el}{elc}{}
\DeclareFontSeriesChangeRule {bc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {bc}{m}{c}{}
\DeclareFontSeriesChangeRule {bc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {bc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {bc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {bc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {bc}{x}{bx}{}
+\DeclareFontSeriesChangeRule {bc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {bc}{?m}{b}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -70,22 +71,13 @@
\DeclareFontSeriesChangeRule {bx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {bx}{el}{elx}{}
\DeclareFontSeriesChangeRule {bx}{l}{lx}{}
-% \end{macrocode}
-%
-% Next rule would be logical, but would just result in many
-% warnings with the default fonts. Without the rule it maps to ``m''.
-% \begin{macrocode}
-%\DeclareFontSeriesChangeRule {bx}{m}{x}{} %<----- mainly
-% % \mdseries
-% \end{macrocode}
-%
-% \begin{macrocode}
\DeclareFontSeriesChangeRule {bx}{sb} {sbx} {}
\DeclareFontSeriesChangeRule {bx}{sl}{slx} {}
\DeclareFontSeriesChangeRule {bx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {bx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {bx}{x}{bx}{}
-\DeclareFontSeriesChangeRule {bx}{mm}{m}{}
+\DeclareFontSeriesChangeRule {bx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {bx}{?m}{b}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -93,7 +85,8 @@
\DeclareFontSeriesChangeRule {b}{c} {bc} {b} %<-----
\DeclareFontSeriesChangeRule {b}{sb} {sb} {b} %<-----
\DeclareFontSeriesChangeRule {b}{x} {bx} {b} %<-----
-\DeclareFontSeriesChangeRule {b}{mm}{m}{}
+\DeclareFontSeriesChangeRule {b}{?m}{b}{}
+\DeclareFontSeriesChangeRule {b}{m?}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -107,7 +100,8 @@
\DeclareFontSeriesChangeRule {c}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {c}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {c}{x}{x}{m} %<-----
-\DeclareFontSeriesChangeRule {c}{mm}{m}{}
+\DeclareFontSeriesChangeRule {c}{?m}{m}{}
+\DeclareFontSeriesChangeRule {c}{m?}{c}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -116,13 +110,13 @@
\DeclareFontSeriesChangeRule {ebc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {ebc}{el}{elc}{}
\DeclareFontSeriesChangeRule {ebc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ebc}{m}{c}{}
\DeclareFontSeriesChangeRule {ebc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {ebc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {ebc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {ebc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {ebc}{x}{ebx}{}
-\DeclareFontSeriesChangeRule {ebc}{mm}{m}{}
+\DeclareFontSeriesChangeRule {ebc}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {ebc}{m?}{c}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -131,19 +125,20 @@
\DeclareFontSeriesChangeRule {ebx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {ebx}{el}{elx}{}
\DeclareFontSeriesChangeRule {ebx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ebx}{m}{x}{}
\DeclareFontSeriesChangeRule {ebx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {ebx}{sl}{slx}{}
\DeclareFontSeriesChangeRule {ebx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {ebx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {ebx}{x}{ebx}{}
-\DeclareFontSeriesChangeRule {ebx}{mm}{m}{}
+\DeclareFontSeriesChangeRule {ebx}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {ebx}{m?}{x}{}
% \end{macrocode}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {eb}{c}{ebc}{}
\DeclareFontSeriesChangeRule {eb}{x}{ebx}{}
-\DeclareFontSeriesChangeRule {eb}{mm}{m}{}
+\DeclareFontSeriesChangeRule {eb}{?m}{eb}{}
+\DeclareFontSeriesChangeRule {eb}{m?}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -152,13 +147,13 @@
\DeclareFontSeriesChangeRule {elc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {elc}{el}{elc}{}
\DeclareFontSeriesChangeRule {elc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {elc}{m}{c}{}
\DeclareFontSeriesChangeRule {elc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {elc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {elc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {elc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {elc}{x}{elx}{}
-\DeclareFontSeriesChangeRule {elc}{mm}{m}{}
+\DeclareFontSeriesChangeRule {elc}{?m}{el}{}
+\DeclareFontSeriesChangeRule {elc}{m?}{c}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -167,19 +162,20 @@
\DeclareFontSeriesChangeRule {elx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {elx}{el}{elx}{}
\DeclareFontSeriesChangeRule {elx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {elx}{m}{x}{}
\DeclareFontSeriesChangeRule {elx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {elx}{sl}{slx}{}
\DeclareFontSeriesChangeRule {elx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {elx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {elx}{x}{elx}{}
-\DeclareFontSeriesChangeRule {elx}{mm}{m}{}
+\DeclareFontSeriesChangeRule {elx}{?m}{el}{}
+\DeclareFontSeriesChangeRule {elx}{m?}{x}{}
% \end{macrocode}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {el}{c}{elc}{}
\DeclareFontSeriesChangeRule {el}{x}{elx}{}
-\DeclareFontSeriesChangeRule {el}{mm}{m}{}
+\DeclareFontSeriesChangeRule {el}{?m}{el}{}
+\DeclareFontSeriesChangeRule {el}{m?}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -188,13 +184,13 @@
\DeclareFontSeriesChangeRule {lc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {lc}{el}{elc}{}
\DeclareFontSeriesChangeRule {lc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {lc}{m}{c}{}
\DeclareFontSeriesChangeRule {lc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {lc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {lc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {lc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {lc}{x}{lx}{}
-\DeclareFontSeriesChangeRule {lc}{mm}{m}{}
+\DeclareFontSeriesChangeRule {lc}{?m}{l}{}
+\DeclareFontSeriesChangeRule {lc}{m?}{c}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -203,13 +199,13 @@
\DeclareFontSeriesChangeRule {lx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {lx}{el}{elx}{}
\DeclareFontSeriesChangeRule {lx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {lx}{m}{x}{}
\DeclareFontSeriesChangeRule {lx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {lx}{sl}{slx}{}
\DeclareFontSeriesChangeRule {lx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {lx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {lx}{x}{lx}{}
-\DeclareFontSeriesChangeRule {lx}{mm}{m}{}
+\DeclareFontSeriesChangeRule {lx}{?m}{l}{}
+\DeclareFontSeriesChangeRule {lx}{m?}{x}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -218,7 +214,8 @@
\DeclareFontSeriesChangeRule {l}{c} {lc} {l} % ? %<-----
\DeclareFontSeriesChangeRule {l}{sb} {sb} {b} % ? %<-----
\DeclareFontSeriesChangeRule {l}{x} {lx} {l} % ? %<-----
-\DeclareFontSeriesChangeRule {l}{mm}{m}{}
+\DeclareFontSeriesChangeRule {l}{?m}{l}{}
+\DeclareFontSeriesChangeRule {l}{m?}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -228,7 +225,8 @@
\DeclareFontSeriesChangeRule {m}{l} {l} {m} %<-----
\DeclareFontSeriesChangeRule {m}{sb} {sb} {b} %<-----
\DeclareFontSeriesChangeRule {m}{x} {x} {m} %<-----
-\DeclareFontSeriesChangeRule {m}{mm}{m}{}
+\DeclareFontSeriesChangeRule {m}{?m}{m}{}
+\DeclareFontSeriesChangeRule {m}{m?}{m}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -237,13 +235,13 @@
\DeclareFontSeriesChangeRule {sbc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {sbc}{el}{elc}{}
\DeclareFontSeriesChangeRule {sbc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {sbc}{m}{c}{}
\DeclareFontSeriesChangeRule {sbc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {sbc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {sbc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {sbc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {sbc}{x}{sbx}{}
-\DeclareFontSeriesChangeRule {sbc}{mm}{m}{}
+\DeclareFontSeriesChangeRule {sbc}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sbc}{m?}{c}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -252,19 +250,20 @@
\DeclareFontSeriesChangeRule {sbx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {sbx}{el}{elx}{}
\DeclareFontSeriesChangeRule {sbx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {sbx}{m}{x}{}
\DeclareFontSeriesChangeRule {sbx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {sbx}{sl}{slx}{}
\DeclareFontSeriesChangeRule {sbx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {sbx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {sbx}{x}{sbx}{}
-\DeclareFontSeriesChangeRule {sbx}{mm}{m}{}
+\DeclareFontSeriesChangeRule {sbx}{?m}{sb}{}
+\DeclareFontSeriesChangeRule {sbx}{m?}{x}{}
% \end{macrocode}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {sb}{c} {sbc} {bc} %? %<-----
\DeclareFontSeriesChangeRule {sb}{x} {sbx} {bx} %? %<-----
-\DeclareFontSeriesChangeRule {sb}{mm}{m}{}
+\DeclareFontSeriesChangeRule {sb}{m?}{m}{}
+\DeclareFontSeriesChangeRule {sb}{?m}{sb}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -273,13 +272,13 @@
\DeclareFontSeriesChangeRule {slc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {slc}{el}{elc}{}
\DeclareFontSeriesChangeRule {slc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {slc}{m}{c}{}
\DeclareFontSeriesChangeRule {slc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {slc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {slc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {slc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {slc}{x}{slx}{}
-\DeclareFontSeriesChangeRule {slc}{mm}{m}{}
+\DeclareFontSeriesChangeRule {slc}{?m}{sl}{}
+\DeclareFontSeriesChangeRule {slc}{m?}{c}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -288,15 +287,20 @@
\DeclareFontSeriesChangeRule {slx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {slx}{el}{elx}{}
\DeclareFontSeriesChangeRule {slx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {slx}{m}{x}{}
\DeclareFontSeriesChangeRule {slx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {slx}{sl}{slx}{}
\DeclareFontSeriesChangeRule {slx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {slx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {slx}{x}{slx}{}
+\DeclareFontSeriesChangeRule {slx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {slx}{?m}{sl}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareFontSeriesChangeRule {sl}{c}{slc}{}
\DeclareFontSeriesChangeRule {sl}{x}{slx}{}
-\DeclareFontSeriesChangeRule {sl}{mm}{m}{}
+\DeclareFontSeriesChangeRule {sl}{m?}{m}{}
+\DeclareFontSeriesChangeRule {sl}{?m}{sl}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -305,13 +309,13 @@
\DeclareFontSeriesChangeRule {ubc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {ubc}{el}{elc}{}
\DeclareFontSeriesChangeRule {ubc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ubc}{m}{c}{}
\DeclareFontSeriesChangeRule {ubc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {ubc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {ubc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {ubc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {ubc}{x}{ubx}{}
-\DeclareFontSeriesChangeRule {sbc}{mm}{m}{}
+\DeclareFontSeriesChangeRule {ubc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {ubc}{?m}{ub}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -320,19 +324,20 @@
\DeclareFontSeriesChangeRule {ubx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {ubx}{el}{elx}{}
\DeclareFontSeriesChangeRule {ubx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ubx}{m}{x}{}
\DeclareFontSeriesChangeRule {ubx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {ubx}{sl}{slx}{}
\DeclareFontSeriesChangeRule {ubx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {ubx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {ubx}{x}{ubx}{}
-\DeclareFontSeriesChangeRule {sbx}{mm}{m}{}
+\DeclareFontSeriesChangeRule {ubx}{?m}{ub}{}
+\DeclareFontSeriesChangeRule {ubx}{m?}{x}{}
% \end{macrocode}
%
% \begin{macrocode}
\DeclareFontSeriesChangeRule {ub}{c}{ubc}{}
\DeclareFontSeriesChangeRule {ub}{x}{ubx}{}
-\DeclareFontSeriesChangeRule {ub}{mm}{m}{}
+\DeclareFontSeriesChangeRule {ub}{?m}{m}{}
+\DeclareFontSeriesChangeRule {ub}{m?}{ub}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -341,13 +346,13 @@
\DeclareFontSeriesChangeRule {ulc}{eb}{ebc}{}
\DeclareFontSeriesChangeRule {ulc}{el}{elc}{}
\DeclareFontSeriesChangeRule {ulc}{l}{lc}{}
-\DeclareFontSeriesChangeRule {ulc}{m}{c}{}
\DeclareFontSeriesChangeRule {ulc}{sb}{sbc}{}
\DeclareFontSeriesChangeRule {ulc}{sl}{slc}{}
\DeclareFontSeriesChangeRule {ulc}{ub}{ubc}{}
\DeclareFontSeriesChangeRule {ulc}{ul}{ulc}{}
\DeclareFontSeriesChangeRule {ulc}{x}{ulx}{}
-\DeclareFontSeriesChangeRule {ulc}{mm}{m}{}
+\DeclareFontSeriesChangeRule {ulc}{m?}{c}{}
+\DeclareFontSeriesChangeRule {ulc}{?m}{ul}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -356,15 +361,20 @@
\DeclareFontSeriesChangeRule {ulx}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {ulx}{el}{elx}{}
\DeclareFontSeriesChangeRule {ulx}{l}{lx}{}
-\DeclareFontSeriesChangeRule {ulx}{m}{x}{}
\DeclareFontSeriesChangeRule {ulx}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {ulx}{sl}{slx}{}
\DeclareFontSeriesChangeRule {ulx}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {ulx}{ul}{ulx}{}
\DeclareFontSeriesChangeRule {ulx}{x}{ulx}{}
+\DeclareFontSeriesChangeRule {ulx}{m?}{x}{}
+\DeclareFontSeriesChangeRule {ulx}{?m}{ul}{}
+% \end{macrocode}
+%
+% \begin{macrocode}
\DeclareFontSeriesChangeRule {ul}{c}{ulc}{}
\DeclareFontSeriesChangeRule {ul}{x}{ulx}{}
-\DeclareFontSeriesChangeRule {ul}{mm}{m}{}
+\DeclareFontSeriesChangeRule {ul}{m?}{m}{}
+\DeclareFontSeriesChangeRule {ul}{?m}{ul}{}
% \end{macrocode}
%
% \begin{macrocode}
@@ -373,12 +383,12 @@
\DeclareFontSeriesChangeRule {x}{eb}{ebx}{}
\DeclareFontSeriesChangeRule {x}{el}{elx}{}
\DeclareFontSeriesChangeRule {x}{l}{lx}{}
-\DeclareFontSeriesChangeRule {x}{m}{x}{}
\DeclareFontSeriesChangeRule {x}{sb}{sbx}{}
\DeclareFontSeriesChangeRule {x}{sl}{slx}{}
\DeclareFontSeriesChangeRule {x}{ub}{ubx}{}
\DeclareFontSeriesChangeRule {x}{ul}{ulx}{}
-\DeclareFontSeriesChangeRule {x}{mm}{m}{}
+\DeclareFontSeriesChangeRule {x}{m?}{x}{}
+\DeclareFontSeriesChangeRule {x}{?m}{m}{}
% \end{macrocode}
%
% \emph{rules need to get completed!}
@@ -1059,11 +1069,10 @@
\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.
+% The default for the medium series is \texttt{m} and this will be
+% interpreted as resetting both weight and width. To reset only one
+% of them the virtual value \textt{?m} and \textt{m?} are available.
% \begin{macrocode}
-\renewcommand\mddefault{mm}
\edef\mdseries at rm{\mddefault}
\edef\mdseries at sf{\mddefault}
\edef\mdseries at tt{\mddefault}
More information about the latex3-commits
mailing list