From 71a679e847414c9806bda8ec9fcbf56855388c98 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 31 Jul 2020 21:43:18 +0000 Subject: merriweather (31jul20) git-svn-id: svn://tug.org/texlive/trunk@56004 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/fonts/merriweather/README | 2 +- .../fonts/merriweather/merriweather-samples.pdf | Bin 111135 -> 111128 bytes .../tex/latex/merriweather/merriweather.sty | 30 ++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/fonts/merriweather/README b/Master/texmf-dist/doc/fonts/merriweather/README index 5f1b0336a8d..d432aa7bab1 100644 --- a/Master/texmf-dist/doc/fonts/merriweather/README +++ b/Master/texmf-dist/doc/fonts/merriweather/README @@ -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 diff --git a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf index 4ac91da309a..e8ef6f1af5c 100644 Binary files a/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf and b/Master/texmf-dist/doc/fonts/merriweather/merriweather-samples.pdf differ diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty index 3c3c73d1d34..35fba36110f 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}[% - 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@ttffalse \fi\fi -\newcommand*{\Merriweather@scale}{1} % not adjustable -\newcommand*{\MerriweatherSans@scale}{1} +\newcommand*{\Merriwthr@scale}{1} % not adjustable +\newcommand*{\MerriwthrSans@scale}{1} \RequirePackage{xkeyval} -\DeclareOptionX{scaled}{\renewcommand*{\MerriweatherSans@scale}{#1}} -\DeclareOptionX{scale}{\renewcommand*{\MerriweatherSans@scale}{#1}} +\DeclareOptionX{scaled}{\renewcommand*{\MerriwthrSans@scale}{#1}} +\DeclareOptionX{scale}{\renewcommand*{\MerriwthrSans@scale}{#1}} \newif\ifmerriweather@rm \merriweather@rmfalse \newif\ifmerriweather@sf \merriweather@sffalse @@ -121,14 +121,14 @@ \ifmerriweather@sflight \ifmerriweather@sfblack \setsansfont - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Light , ItalicFont = *-LightItalic , BoldFont = *-ExtraBold , BoldItalicFont = *-ExBoldIt ] {MerriweatherSans} \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Light , ItalicFont = *-LightItalic , BoldFont = *-ExtraBold , @@ -136,14 +136,14 @@ {MerriweatherSans} \else \setsansfont - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Light , ItalicFont = *-LightItalic , BoldFont = *-Bold , BoldItalicFont = *-BoldItalic ] {MerriweatherSans} \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Light , ItalicFont = *-LightItalic , BoldFont = *-Bold , @@ -153,14 +153,14 @@ \else \ifmerriweather@sfblack \setsansfont - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Regular , ItalicFont = *-Italic , BoldFont = *-ExtraBold , BoldItalicFont = *-ExBoldIt ] {MerriweatherSans} \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Regular , ItalicFont = *-Italic , BoldFont = *-ExtraBold , @@ -168,14 +168,14 @@ {MerriweatherSans} \else \setsansfont - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Regular , ItalicFont = *-Italic , BoldFont = *-Bold , BoldItalicFont = *-BoldItalic ] {MerriweatherSans} \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Regular , ItalicFont = *-Italic , BoldFont = *-Bold , @@ -196,7 +196,7 @@ BoldItalicFont = *-LightIt ] {Merriweather} \newfontfamily\merriweathersanslight - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-Light , ItalicFont = *-LightItalic , BoldFont = *-Light , @@ -209,7 +209,7 @@ BoldItalicFont = *-UltraBdIt ] {Merriweather} \newfontfamily\merriweathersansblack - [ Scale = \MerriweatherSans@scale , + [ Scale = \MerriwthrSans@scale , UprightFont = *-ExtraBold , ItalicFont = *-ExBoldIt , BoldFont = *-ExtraBold , -- cgit v1.2.3