summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-03-30 21:32:20 +0000
committerKarl Berry <karl@freefriends.org>2017-03-30 21:32:20 +0000
commitac3830965b467b1923d14cf499dcd03d39868082 (patch)
tree4cf53b0cbf1ff61414f56dc7186d9b12cb085a37
parenta6ce8b6c4afe781ec559334e8e524eddd1113286 (diff)
mweights (30mar17)
git-svn-id: svn://tug.org/texlive/trunk@43647 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/mweights/README2
-rw-r--r--Master/texmf-dist/tex/latex/mweights/mweights.sty11
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
3 files changed, 12 insertions, 2 deletions
diff --git a/Master/texmf-dist/doc/latex/mweights/README b/Master/texmf-dist/doc/latex/mweights/README
index bf1fe9c1ab0..0c03cfd6095 100644
--- a/Master/texmf-dist/doc/latex/mweights/README
+++ b/Master/texmf-dist/doc/latex/mweights/README
@@ -1,5 +1,5 @@
This is the README for the mweights package, version
-2017-03-24.
+2017-03-30.
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 0d312f10cc2..1f899048055 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/03/24 (Bob Tennent) Support package for multiple-weight font packages. ]
+ [2017/03/30 (Bob Tennent) Support package for multiple-weight font packages. ]
\def\mweights@init{%
% Define any undefined \mdseries@rm etc.
@@ -44,18 +44,21 @@
\else\ifx\f@series\bfseries@sf\fontseries\bfseries@rm
\else\ifx\f@series\mddef@ult\fontseries\mdseries@rm
\else\ifx\f@series\bfdef@ult\fontseries\bfseries@rm
+ \else\fontseries\mdseries@rm
\fi\fi\fi\fi
\else\ifx\f@family\ttdef@ult
\ifx\f@series\mdseries@tt\fontseries\mdseries@rm
\else\ifx\f@series\bfseries@tt\fontseries\bfseries@rm
\else\ifx\f@series\mddef@ult\fontseries\mdseries@rm
\else\ifx\f@series\bfdef@ult\fontseries\bfseries@rm
+ \else\fontseries\mdseries@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
+ \else\fontseries\mdseries@rm
\fi\fi\fi\fi
\else\fontseries\mdseries@rm
\fi\fi\fi\fontfamily\rmdefault\selectfont}
@@ -69,18 +72,21 @@
\else\ifx\f@series\bfseries@rm\fontseries\bfseries@sf
\else\ifx\f@series\mddef@ult\fontseries\mdseries@sf
\else\ifx\f@series\bfdef@ult\fontseries\bfseries@sf
+ \else\fontseries\mdseries@sf
\fi\fi\fi\fi
\else\ifx\f@family\ttdef@ult
\ifx\f@series\mdseries@tt\fontseries\mdseries@sf
\else\ifx\f@series\bfseries@tt\fontseries\bfseries@sf
\else\ifx\f@series\mddef@ult\fontseries\mdseries@sf
\else\ifx\f@series\bfdef@ult\fontseries\bfseries@sf
+ \else\fontseries\mdseries@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
+ \else\fontseries\mdseries@sf
\fi\fi\fi\fi
\else\fontseries\mdseries@sf
\fi\fi\fi\fontfamily\sfdefault\selectfont}
@@ -94,18 +100,21 @@
\else\ifx\f@series\bfseries@rm\fontseries\bfseries@tt
\else\ifx\f@series\mddef@ult\fontseries\mdseries@tt
\else\ifx\f@series\bfdef@ult\fontseries\bfseries@tt
+ \else\fontseries\mdseries@tt
\fi\fi\fi\fi
\else\ifx\f@family\sfdef@ult
\ifx\f@series\mdseries@sf\fontseries\mdseries@tt
\else\ifx\f@series\bfseries@sf\fontseries\bfseries@tt
\else\ifx\f@series\mddef@ult\fontseries\mdseries@tt
\else\ifx\f@series\bfdef@ult\fontseries\bfseries@tt
+ \else\fontseries\mdseries@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
+ \else\fontseries\mdseries@tt
\fi\fi\fi\fi
\else\fontseries\mdseries@tt
\fi\fi\fi\fontfamily\ttdefault\selectfont}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 9ab992747b5..88cbd841ea8 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -1043,6 +1043,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'stmaryrd', "&MAKEflatten",
'stellenbosch',"&MAKEcopy",
'streetex', "die 'skipping, nonfree'",
+ 'studies-lm', "die 'skipping, nonfree'",
'style_showcase', "die 'skipping, until JimH advises it is a good idea'",
'svg', "&MAKEflatten",
'svjour', "die 'skipping, license and packaging unclear'",