summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/mweights/README2
-rw-r--r--Master/texmf-dist/tex/latex/mweights/mweights.sty11
2 files changed, 9 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/latex/mweights/README b/Master/texmf-dist/doc/latex/mweights/README
index cfa30b18e99..eebe3f22562 100644
--- a/Master/texmf-dist/doc/latex/mweights/README
+++ b/Master/texmf-dist/doc/latex/mweights/README
@@ -1,4 +1,4 @@
-This is the README for the mweights package, version 2016-12-02.
+This is the README for the mweights package, version 2016-12-04.
Many font families available for use with LaTeX have multiple
weights, especially when originally aimed at use on the web. For
diff --git a/Master/texmf-dist/tex/latex/mweights/mweights.sty b/Master/texmf-dist/tex/latex/mweights/mweights.sty
index a50156de382..4fe5df421ff 100644
--- a/Master/texmf-dist/tex/latex/mweights/mweights.sty
+++ b/Master/texmf-dist/tex/latex/mweights/mweights.sty
@@ -1,7 +1,7 @@
\ProvidesPackage{mweights}
- [2016/12/02 (Bob Tennent) Support package for multiple-weight font packages. ]
-
+ [2016/12/04 (Bob Tennent) Support package for multiple-weight font packages. ]
+\def\mweights@init{%
% Define any undefined \mdseries@rm etc.
% Defined \mdseries@rm etc. assumed to be fully expanded!
\ifdefined\mdseries@rm\else\edef\mdseries@rm{\mddefault}\fi
@@ -10,15 +10,16 @@
\ifdefined\bfseries@sf\else\edef\bfseries@sf{\bfdefault}\fi
\ifdefined\mdseries@tt\else\edef\mdseries@tt{\mddefault}\fi
\ifdefined\bfseries@tt\else\edef\bfseries@tt{\bfdefault}\fi
-
% In case any unexpanded macros present in \rmdefault, etc
\edef\rmdef@ult{\rmdefault}
\edef\sfdef@ult{\sfdefault}
\edef\ttdef@ult{\ttdefault}
\edef\bfdef@ult{\bfdefault}
\edef\mddef@ult{\mddefault}
+}
\DeclareRobustCommand\bfseries{%
+\mweights@init
\not@math@alphabet\bfseries\mathbf
\ifx\f@family\rmdef@ult\fontseries\bfseries@rm
\else\ifx\f@family\sfdef@ult\fontseries\bfseries@sf
@@ -26,6 +27,7 @@
\else\fontseries\bfdefault\fi\fi\fi\selectfont}%
\DeclareRobustCommand\mdseries{%
+\mweights@init
\not@math@alphabet\mdseries\relax
\ifx\f@family\rmdef@ult\fontseries\mdseries@rm
\else\ifx\f@family\sfdef@ult\fontseries\mdseries@sf
@@ -33,6 +35,7 @@
\else\fontseries\mddefault\fi\fi\fi\selectfont}
\DeclareRobustCommand\rmfamily{%
+\mweights@init
\not@math@alphabet\rmfamily\mathrm
% change the current series before changing the family
\ifx\f@family\sfdef@ult
@@ -51,6 +54,7 @@
\fi\fi\fontfamily\rmdefault\selectfont}
\DeclareRobustCommand\sffamily{%
+\mweights@init
\not@math@alphabet\sffamily\mathsf
% change the current series before changing the family
\ifx\f@family\rmdef@ult
@@ -69,6 +73,7 @@
\fi\fi\fontfamily\sfdefault\selectfont}
\DeclareRobustCommand\ttfamily{%
+\mweights@init
\not@math@alphabet\ttfamily\mathtt
% change the current series before changing the family
\ifx\f@family\rmdef@ult