From 2c07b6ce7350e7d95590121e6ba6d40c538b2fa7 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 14 Oct 2019 20:44:59 +0000
Subject: merriweather (13oct19)

git-svn-id: svn://tug.org/texlive/trunk@52380 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/merriweather/merriweather.sty | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'Master/texmf-dist/tex')

diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
index 231fc152c1b..6f2f5e07e68 100644
--- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
+++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
@@ -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@rm
-    \ifmerriweather@rmlight\def\mdseries@rm{light}\else\def\mdseries@rm{regular}\fi
-    \ifmerriweather@rmblack\def\bfseries@rm{ultrabold}\else\def\bfseries@rm{bold}\fi
+    \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi
+    \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi
   \else
     \def\mdseries@rm{m}\def\bfseries@rm{b}
   \fi
   \ifmerriweather@sf
-    \ifmerriweather@sflight\def\mdseries@sf{light}\else\def\mdseries@sf{regular}\fi
-    \ifmerriweather@sfblack\def\bfseries@sf{extrabold}\else\def\bfseries@sf{bold}\fi
+    \ifmerriweather@sflight\def\mdseries@sf{l}\else\def\mdseries@sf{m}\fi
+    \ifmerriweather@sfblack\def\bfseries@sf{eb}\else\def\bfseries@sf{b}\fi
   \else
     \def\mdseries@sf{m}\def\bfseries@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
 
-- 
cgit v1.2.3