diff options
author | Norbert Preining <norbert@preining.info> | 2020-08-01 03:02:43 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-08-01 03:02:43 +0000 |
commit | 614c1765c3e9a6f5665cbf4f4fb60e768054c2d4 (patch) | |
tree | 57090b05f864f2b7a96c04eae6f19a74261aed62 /fonts/merriweather/latex/merriweather.sty | |
parent | aadc6fbc73f1ca0b93f8c406c46cdb2600bce890 (diff) |
CTAN sync 202008010302
Diffstat (limited to 'fonts/merriweather/latex/merriweather.sty')
-rw-r--r-- | fonts/merriweather/latex/merriweather.sty | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/fonts/merriweather/latex/merriweather.sty b/fonts/merriweather/latex/merriweather.sty index 3c3c73d1d3..35fba36110 100644 --- a/fonts/merriweather/latex/merriweather.sty +++ b/fonts/merriweather/latex/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 , |