mweights (24mar17)

git-svn-id: svn://tug.org/texlive/trunk@43594 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 30 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/mweights/README b/Master/texmf-dist/doc/latex/mweights/README
index 2061b6bf8cd..bf1fe9c1ab0 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-02-27.
+2017-03-24.
 
 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 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
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index c2f7faf3f70..7849efcbd69 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3061,15 +3061,20 @@ for (@ARGV) {
 }
 
 
-# we do not want to deal with anything but "normal" characters, a subset
+# We do not want to deal with anything but "normal" characters, a subset
 # of 7-bit ASCII.  The file names appear in too many contexts for
 # anything else to reliably work.
 # 
+# Nothing in tlpdb itself restricts the characters used (except for
+# spaces and newlines), but we want to be cautious here. That
+# discrepancy seems ok?
+# 
 sub sanitize_file_names {
   my ($dir) = @_;
   # -0 in case of spaces or other chars in filenames, which would be
   # parsed into words by the shell otherwise.
-  &SYSTEM ("find $dir -print0 | xargs -0 /l/bin/rename 's![^-_A-Za-z0-9.,/+]!!g'");
+  &SYSTEM ("find $dir -print0 \
+            | xargs -0 /l/bin/rename 's![^-_A-Za-z0-9.,/+]!!g'");
 }