texlive[43594] Master: mweights (24mar17)

[commits+karl at tug.org]

Revision: 43594
          http://tug.org/svn/texlive?view=revision&revision=43594
Author:   karl
Date:     2017-03-24 23:27:21 +0100 (Fri, 24 Mar 2017)
Log Message:
-----------
mweights (24mar17)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/mweights/README
    trunk/Master/texmf-dist/tex/latex/mweights/mweights.sty
    trunk/Master/tlpkg/libexec/ctan2tds

Modified: trunk/Master/texmf-dist/doc/latex/mweights/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/mweights/README	2017-03-24 01:02:45 UTC (rev 43593)
+++ trunk/Master/texmf-dist/doc/latex/mweights/README	2017-03-24 22:27:21 UTC (rev 43594)
@@ -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

Modified: trunk/Master/texmf-dist/tex/latex/mweights/mweights.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/mweights/mweights.sty	2017-03-24 01:02:45 UTC (rev 43593)
+++ trunk/Master/texmf-dist/tex/latex/mweights/mweights.sty	2017-03-24 22:27:21 UTC (rev 43594)
@@ -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 at init{%
 % Define any undefined \mdseries at rm etc. 
@@ -51,8 +51,14 @@
     \else\ifx\f at series\mddef at ult\fontseries\mdseries at rm
     \else\ifx\f at series\bfdef at ult\fontseries\bfseries at rm
     \fi\fi\fi\fi
+\else\ifx\f at family\rmdef at ult
+    \ifx\f at series\mdseries at rm\fontseries\mdseries at rm
+    \else\ifx\f at series\bfseries at rm\fontseries\bfseries at rm
+    \else\ifx\f at series\mddef at ult\fontseries\mdseries at rm
+    \else\ifx\f at series\bfdef at ult\fontseries\bfseries at rm
+    \fi\fi\fi\fi
 \else\fontseries\mdseries at rm
-\fi\fi\fontfamily\rmdefault\selectfont}
+\fi\fi\fi\fontfamily\rmdefault\selectfont}
 
 \DeclareRobustCommand\sffamily{%
 \mweights at init
@@ -70,8 +76,14 @@
     \else\ifx\f at series\mddef at ult\fontseries\mdseries at sf
     \else\ifx\f at series\bfdef at ult\fontseries\bfseries at sf
     \fi\fi\fi\fi
+\else\ifx\f at family\sfdef at ult
+    \ifx\f at series\mdseries at sf\fontseries\mdseries at sf
+    \else\ifx\f at series\bfseries at sf\fontseries\bfseries at sf
+    \else\ifx\f at series\mddef at ult\fontseries\mdseries at sf
+    \else\ifx\f at series\bfdef at ult\fontseries\bfseries at sf
+    \fi\fi\fi\fi
 \else\fontseries\mdseries at sf
-\fi\fi\fontfamily\sfdefault\selectfont}
+\fi\fi\fi\fontfamily\sfdefault\selectfont}
 
 \DeclareRobustCommand\ttfamily{%
 \mweights at init
@@ -89,8 +101,14 @@
     \else\ifx\f at series\mddef at ult\fontseries\mdseries at tt
     \else\ifx\f at series\bfdef at ult\fontseries\bfseries at tt
     \fi\fi\fi\fi
+\else\ifx\f at family\ttdef at ult
+    \ifx\f at series\mdseries at tt\fontseries\mdseries at tt
+    \else\ifx\f at series\bfseries at tt\fontseries\bfseries at tt
+    \else\ifx\f at series\mddef at ult\fontseries\mdseries at tt
+    \else\ifx\f at series\bfdef at ult\fontseries\bfseries at tt
+    \fi\fi\fi\fi
 \else\fontseries\mdseries at tt
-\fi\fi\fontfamily\ttdefault\selectfont}
+\fi\fi\fi\fontfamily\ttdefault\selectfont}
 
 % override default family with new \familydefault
 \AtBeginDocument{\mweights at init

Modified: trunk/Master/tlpkg/libexec/ctan2tds
===================================================================
--- trunk/Master/tlpkg/libexec/ctan2tds	2017-03-24 01:02:45 UTC (rev 43593)
+++ trunk/Master/tlpkg/libexec/ctan2tds	2017-03-24 22:27:21 UTC (rev 43594)
@@ -3061,15 +3061,20 @@
 }
 
 

-# 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'");
 }