diff options
| author | Karl Berry <karl@freefriends.org> | 2017-03-24 22:27:21 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2017-03-24 22:27:21 +0000 |
| commit | 638c484cd54573bf377234d46c5d564c53421bb5 (patch) | |
| tree | 7a6a70c3f015fe7401ccf7b46708ca706987bbde /Master/texmf-dist/tex | |
| parent | 2e8a37ac84488349711473be01df0db39db5445c (diff) | |
mweights (24mar17)
git-svn-id: svn://tug.org/texlive/trunk@43594 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/mweights/mweights.sty | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/Master/texmf-dist/tex/latex/mweights/mweights.sty b/Master/texmf-dist/tex/latex/mweights/mweights.sty index b67f06fb72f..0d312f10cc2 100644 --- a/Master/texmf-dist/tex/latex/mweights/mweights.sty +++ b/Master/texmf-dist/tex/latex/mweights/mweights.sty @@ -1,5 +1,5 @@ \ProvidesPackage{mweights} - [2017/02/27 (Bob Tennent) Support package for multiple-weight font packages. ] + [2017/03/24 (Bob Tennent) Support package for multiple-weight font packages. ] \def\mweights@init{% % Define any undefined \mdseries@rm etc. @@ -51,8 +51,14 @@ \else\ifx\f@series\mddef@ult\fontseries\mdseries@rm \else\ifx\f@series\bfdef@ult\fontseries\bfseries@rm \fi\fi\fi\fi +\else\ifx\f@family\rmdef@ult + \ifx\f@series\mdseries@rm\fontseries\mdseries@rm + \else\ifx\f@series\bfseries@rm\fontseries\bfseries@rm + \else\ifx\f@series\mddef@ult\fontseries\mdseries@rm + \else\ifx\f@series\bfdef@ult\fontseries\bfseries@rm + \fi\fi\fi\fi \else\fontseries\mdseries@rm -\fi\fi\fontfamily\rmdefault\selectfont} +\fi\fi\fi\fontfamily\rmdefault\selectfont} \DeclareRobustCommand\sffamily{% \mweights@init @@ -70,8 +76,14 @@ \else\ifx\f@series\mddef@ult\fontseries\mdseries@sf \else\ifx\f@series\bfdef@ult\fontseries\bfseries@sf \fi\fi\fi\fi +\else\ifx\f@family\sfdef@ult + \ifx\f@series\mdseries@sf\fontseries\mdseries@sf + \else\ifx\f@series\bfseries@sf\fontseries\bfseries@sf + \else\ifx\f@series\mddef@ult\fontseries\mdseries@sf + \else\ifx\f@series\bfdef@ult\fontseries\bfseries@sf + \fi\fi\fi\fi \else\fontseries\mdseries@sf -\fi\fi\fontfamily\sfdefault\selectfont} +\fi\fi\fi\fontfamily\sfdefault\selectfont} \DeclareRobustCommand\ttfamily{% \mweights@init @@ -89,8 +101,14 @@ \else\ifx\f@series\mddef@ult\fontseries\mdseries@tt \else\ifx\f@series\bfdef@ult\fontseries\bfseries@tt \fi\fi\fi\fi +\else\ifx\f@family\ttdef@ult + \ifx\f@series\mdseries@tt\fontseries\mdseries@tt + \else\ifx\f@series\bfseries@tt\fontseries\bfseries@tt + \else\ifx\f@series\mddef@ult\fontseries\mdseries@tt + \else\ifx\f@series\bfdef@ult\fontseries\bfseries@tt + \fi\fi\fi\fi \else\fontseries\mdseries@tt -\fi\fi\fontfamily\ttdefault\selectfont} +\fi\fi\fi\fontfamily\ttdefault\selectfont} % override default family with new \familydefault \AtBeginDocument{\mweights@init |