texlive[52380] Master/texmf-dist: merriweather (13oct19)

[commits+karl at tug.org]

Revision: 52380
          http://tug.org/svn/texlive?view=revision&revision=52380
Author:   karl
Date:     2019-10-14 22:44:59 +0200 (Mon, 14 Oct 2019)
Log Message:
-----------
merriweather (13oct19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/fonts/merriweather/README
    trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty

Modified: trunk/Master/texmf-dist/doc/fonts/merriweather/README
===================================================================
--- trunk/Master/texmf-dist/doc/fonts/merriweather/README	2019-10-14 20:41:24 UTC (rev 52379)
+++ trunk/Master/texmf-dist/doc/fonts/merriweather/README	2019-10-14 20:44:59 UTC (rev 52380)
@@ -1,4 +1,4 @@
-This is the README for the merriweather package, version 2019-06-02.
+This is the README for the merriweather package, version 2019-10-13.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
 the Merriweather and MerriweatherSans families of fonts, designed by

Modified: trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty	2019-10-14 20:41:24 UTC (rev 52379)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty	2019-10-14 20:44:59 UTC (rev 52380)
@@ -1,5 +1,5 @@
 \ProvidesPackage{merriweather}[%
-   2019/06/02 (Bob Tennent)  Supports Merriweather(Sans) fonts for all LaTeX engines. ] 
+   2019/10/13 (Bob Tennent)  Supports Merriweather(Sans) fonts for all LaTeX engines. ] 
 
 \RequirePackage{ifxetex,ifluatex,textcomp}
 
@@ -219,14 +219,14 @@
 \else % type1
 
   \ifmerriweather at rm
-    \ifmerriweather at rmlight\def\mdseries at rm{light}\else\def\mdseries at rm{regular}\fi
-    \ifmerriweather at rmblack\def\bfseries at rm{ultrabold}\else\def\bfseries at rm{bold}\fi
+    \ifmerriweather at rmlight\def\mdseries at rm{l}\else\def\mdseries at rm{m}\fi
+    \ifmerriweather at rmblack\def\bfseries at rm{ub}\else\def\bfseries at rm{b}\fi
   \else
     \def\mdseries at rm{m}\def\bfseries at rm{b}
   \fi
   \ifmerriweather at sf
-    \ifmerriweather at sflight\def\mdseries at sf{light}\else\def\mdseries at sf{regular}\fi
-    \ifmerriweather at sfblack\def\bfseries at sf{extrabold}\else\def\bfseries at sf{bold}\fi
+    \ifmerriweather at sflight\def\mdseries at sf{l}\else\def\mdseries at sf{m}\fi
+    \ifmerriweather at sfblack\def\bfseries at sf{eb}\else\def\bfseries at sf{b}\fi
   \else
     \def\mdseries at sf{m}\def\bfseries at sf{b}
   \fi
@@ -252,10 +252,10 @@
 
   \newcommand*\merriweather{\fontfamily{\merriweatherfamily}\selectfont}
   \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont}
-  \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{light}\selectfont}
-  \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{light}\selectfont}
-  \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ultrabold}\selectfont}
-  \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{extrabold}\selectfont}
+  \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont}
+  \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont}
+  \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont}
+  \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont}
 
 \fi