texlive[56004] Master/texmf-dist: merriweather (31jul20)

[commits+karl at tug.org]

Revision: 56004
          http://tug.org/svn/texlive?view=revision&revision=56004
Author:   karl
Date:     2020-07-31 23:43:18 +0200 (Fri, 31 Jul 2020)
Log Message:
-----------
merriweather (31jul20)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/fonts/merriweather/README
    trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
    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	2020-07-31 21:40:14 UTC (rev 56003)
+++ trunk/Master/texmf-dist/doc/fonts/merriweather/README	2020-07-31 21:43:18 UTC (rev 56004)
@@ -1,4 +1,4 @@
-This is the README for the merriweather package, version 2020-07-30.
+This is the README for the merriweather package, version 2020-07-31.
 
 This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
 the Merriweather and MerriweatherSans families of fonts, designed by

Modified: trunk/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty	2020-07-31 21:40:14 UTC (rev 56003)
+++ trunk/Master/texmf-dist/tex/latex/merriweather/merriweather.sty	2020-07-31 21:43:18 UTC (rev 56004)
@@ -1,5 +1,5 @@
 \ProvidesPackage{merriweather}[%
-   2020/07/30 (Bob Tennent)  Supports Merriweather(Sans) fonts for all LaTeX engines. ] 
+   2020/07/31 (Bob Tennent)  Supports Merriweather(Sans) fonts for all LaTeX engines. ] 
 
 \RequirePackage{ifxetex,ifluatex,textcomp}
 
@@ -12,11 +12,11 @@
   \merriweather at ttffalse
 \fi\fi
 
-\newcommand*{\Merriweather at scale}{1}  % not adjustable
-\newcommand*{\MerriweatherSans at scale}{1}
+\newcommand*{\Merriwthr at scale}{1}  % not adjustable
+\newcommand*{\MerriwthrSans at scale}{1}
 \RequirePackage{xkeyval}
-\DeclareOptionX{scaled}{\renewcommand*{\MerriweatherSans at scale}{#1}}
-\DeclareOptionX{scale}{\renewcommand*{\MerriweatherSans at scale}{#1}}
+\DeclareOptionX{scaled}{\renewcommand*{\MerriwthrSans at scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\MerriwthrSans at scale}{#1}}
 
 \newif\ifmerriweather at rm \merriweather at rmfalse
 \newif\ifmerriweather at sf \merriweather at sffalse
@@ -121,7 +121,7 @@
     \ifmerriweather at sflight
       \ifmerriweather at sfblack
         \setsansfont
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Light ,
               ItalicFont     = *-LightItalic ,
               BoldFont       = *-ExtraBold , 
@@ -128,7 +128,7 @@
               BoldItalicFont = *-ExBoldIt ]  
             {MerriweatherSans}
         \newfontfamily\merriweathersans
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Light ,
               ItalicFont     = *-LightItalic ,
               BoldFont       = *-ExtraBold , 
@@ -136,7 +136,7 @@
             {MerriweatherSans}
       \else
         \setsansfont
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Light ,
               ItalicFont     = *-LightItalic ,
               BoldFont       = *-Bold , 
@@ -143,7 +143,7 @@
               BoldItalicFont = *-BoldItalic ]  
             {MerriweatherSans}
         \newfontfamily\merriweathersans
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Light ,
               ItalicFont     = *-LightItalic ,
               BoldFont       = *-Bold , 
@@ -153,7 +153,7 @@
     \else
       \ifmerriweather at sfblack
         \setsansfont
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Regular ,
               ItalicFont     = *-Italic ,
               BoldFont       = *-ExtraBold , 
@@ -160,7 +160,7 @@
               BoldItalicFont = *-ExBoldIt ]  
             {MerriweatherSans}
         \newfontfamily\merriweathersans
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Regular ,
               ItalicFont     = *-Italic ,
               BoldFont       = *-ExtraBold , 
@@ -168,7 +168,7 @@
             {MerriweatherSans}
       \else
         \setsansfont
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Regular ,
               ItalicFont     = *-Italic ,
               BoldFont       = *-Bold , 
@@ -175,7 +175,7 @@
               BoldItalicFont = *-BoldItalic ]  
             {MerriweatherSans}
         \newfontfamily\merriweathersans
-            [ Scale     = \MerriweatherSans at scale ,
+            [ Scale     = \MerriwthrSans at scale ,
               UprightFont    = *-Regular ,
               ItalicFont     = *-Italic ,
               BoldFont       = *-Bold , 
@@ -196,7 +196,7 @@
         BoldItalicFont = *-LightIt ]
       {Merriweather}
   \newfontfamily\merriweathersanslight
-      [ Scale     = \MerriweatherSans at scale ,
+      [ Scale     = \MerriwthrSans at scale ,
         UprightFont    = *-Light ,
         ItalicFont     = *-LightItalic ,
         BoldFont       = *-Light ,
@@ -209,7 +209,7 @@
         BoldItalicFont = *-UltraBdIt ]
       {Merriweather}
   \newfontfamily\merriweathersansblack
-      [ Scale     = \MerriweatherSans at scale ,
+      [ Scale     = \MerriwthrSans at scale ,
         UprightFont    = *-ExtraBold ,
         ItalicFont     = *-ExBoldIt ,
         BoldFont       = *-ExtraBold ,