From c34d7811fa0e8cbe77c0625c5720c1821b242d52 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 16 Jun 2014 23:14:13 +0000 Subject: merriweather git-svn-id: svn://tug.org/texlive/trunk@34263 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/merriweather/LY1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/LY1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/LY1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/Merriweather.sty | 39 ---- .../tex/latex/merriweather/OT1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/OT1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/OT1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/T1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/T1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/T1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/TS1Merriweather-OsF.fd | 32 ++-- .../latex/merriweather/TS1MerriweatherSans-OsF.fd | 74 -------- .../latex/merriweather/TS1MerriweatherSans-TLF.fd | 74 ++++++++ .../tex/latex/merriweather/merriweather.sty | 205 +++++++++++++-------- 14 files changed, 489 insertions(+), 475 deletions(-) delete mode 100644 Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/merriweather/Merriweather.sty delete mode 100644 Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd delete mode 100644 Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd create mode 100644 Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd (limited to 'Master/texmf-dist/tex/latex') diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd index 0814f744ee5..2b118321df5 100644 --- a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/24 %% \ProvidesFile{LY1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for LY1/Merriweather-OsF.] + [2014/01/24 (autoinst) Font definitions for LY1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-ly1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-ly1 }{} \DeclareFontShape{LY1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{LY1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-ly1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-ly1 + <-> \Merriweather@@scale Merriweather-Regular-osf-ly1 }{} \DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1 +}{} + +\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd deleted file mode 100644 index 5b878e18a03..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{LY1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for LY1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{LY1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ly1 -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..0b5642a3b3e --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{LY1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for LY1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{LY1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ly1 +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{LY1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty deleted file mode 100644 index 5ad107a4760..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty +++ /dev/null @@ -1,39 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{Merriweather} - [2013/11/10 (autoinst) Style file for Merriweather.] - -\RequirePackage[T1,LY1]{fontenc} -\RequirePackage{textcomp} -\IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} -\IfFileExists{fontaxes.sty}{ - \RequirePackage{fontaxes} -}{} - -\IfFileExists{xkeyval.sty}{ - \newcommand*{\Merriweather@scale}{1} - \RequirePackage{xkeyval} - \DeclareOptionX{scale}{\renewcommand*{\Merriweather@scale}{##1}} - \DeclareOptionX{scaled}{\renewcommand*{\Merriweather@scale}{##1}} -}{ - \let\DeclareOptionX\DeclareOption - \let\ExecuteOptionsX\ExecuteOptions - \let\ProcessOptionsX\ProcessOptions -} - -\DeclareOptionX{oldstyle}{\edef\Merriweather@figurestyle{OsF}} -\DeclareOptionX{proportional}{\edef\Merriweather@figurealign{}} -\DeclareOptionX{heavy}{\edef\bfseries@rm{h}} -\DeclareOptionX{bold}{\edef\bfseries@rm{b}} -\DeclareOptionX{light}{\edef\mdseries@rm{l}} -\DeclareOptionX{regular}{\edef\mdseries@rm{m}} -\ExecuteOptionsX{oldstyle,proportional,bold,regular} -\ProcessOptionsX\relax - -\renewcommand* - {\rmdefault} - {Merriweather-\Merriweather@figurealign\Merriweather@figurestyle} -\renewcommand*{\familydefault}{\rmdefault} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd index 2342ada7497..31ea2fc671b 100644 --- a/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/22 %% \ProvidesFile{OT1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for OT1/Merriweather-OsF.] + [2014/01/22 (autoinst) Font definitions for OT1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-ot1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-ot1 }{} \DeclareFontShape{OT1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-ot1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-ot1 + <-> \Merriweather@@scale Merriweather-Regular-osf-ot1 }{} \DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1 +}{} + +\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd deleted file mode 100644 index a4d9063b5a4..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{OT1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for OT1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{OT1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ot1 -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..8b257f4a70e --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{OT1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for OT1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{OT1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ot1 +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{OT1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd index cae2e3a699a..93b7b387d71 100644 --- a/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/22 %% \ProvidesFile{T1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for T1/Merriweather-OsF.] + [2014/01/22 (autoinst) Font definitions for T1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-t1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-t1 }{} \DeclareFontShape{T1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{T1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-t1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-t1 + <-> \Merriweather@@scale Merriweather-Regular-osf-t1 }{} \DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1 +}{} + +\DeclareFontShape{T1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd deleted file mode 100644 index eef2f1d171a..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{T1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for T1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{T1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-t1 -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..b0e0be3a0d2 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{T1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for T1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{T1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-t1 +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{T1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd index b136f111362..75dd3b220ce 100644 --- a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd +++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd @@ -1,7 +1,7 @@ -%% Generated by autoinst on 2013/11/10 +%% Generated by autoinst on 2014/01/22 %% \ProvidesFile{TS1Merriweather-OsF.fd} - [2013/11/10 (autoinst) Font definitions for TS1/Merriweather-OsF.] + [2014/01/22 (autoinst) Font definitions for TS1/Merriweather-OsF.] \expandafter\ifx\csname Merriweather@scale\endcsname\relax \let\Merriweather@@scale\@empty @@ -16,25 +16,13 @@ }{} \DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{ - <-> \Merriweather@@scale Merriweather-LightItalic-osf-ts1 + <-> \Merriweather@@scale Merriweather-LightIt-osf-ts1 }{} \DeclareFontShape{TS1}{Merriweather-OsF}{l}{sl}{ <-> ssub * Merriweather-OsF/l/it }{} -\DeclareFontShape{TS1}{Merriweather-OsF}{h}{n}{ - <-> \Merriweather@@scale Merriweather-Heavy-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{h}{it}{ - <-> \Merriweather@@scale Merriweather-HeavyItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{Merriweather-OsF}{h}{sl}{ - <-> ssub * Merriweather-OsF/h/it -}{} - \DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{ <-> \Merriweather@@scale Merriweather-Bold-osf-ts1 }{} @@ -48,7 +36,7 @@ }{} \DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{ - <-> \Merriweather@@scale Merriweather-osf-ts1 + <-> \Merriweather@@scale Merriweather-Regular-osf-ts1 }{} \DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{ @@ -59,6 +47,18 @@ <-> ssub * Merriweather-OsF/m/it }{} +\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{ + <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{ + <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1 +}{} + +\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{ + <-> ssub * Merriweather-OsF/ub/it +}{} + \DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{ <-> ssub * Merriweather-OsF/b/sl }{} diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd deleted file mode 100644 index a42d873f4fc..00000000000 --- a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd +++ /dev/null @@ -1,74 +0,0 @@ -%% Generated by autoinst on 2013/11/10 -%% -\ProvidesFile{TS1MerriweatherSans-OsF.fd} - [2013/11/10 (autoinst) Font definitions for TS1/MerriweatherSans-OsF.] - -\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax - \let\MerriweatherSans@@scale\@empty -\else - \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% -\fi - -\DeclareFontFamily{TS1}{MerriweatherSans-OsF}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{sl}{ - <-> ssub * MerriweatherSans-OsF/l/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBldItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{sl}{ - <-> ssub * MerriweatherSans-OsF/eb/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{n}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{it}{ - <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ts1 -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{sl}{ - <-> ssub * MerriweatherSans-OsF/m/it -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{sl}{ - <-> ssub * MerriweatherSans-OsF/b/sl -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{n}{ - <-> ssub * MerriweatherSans-OsF/b/n -}{} - -\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{it}{ - <-> ssub * MerriweatherSans-OsF/b/it -}{} - -\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd new file mode 100644 index 00000000000..b8a6fdde783 --- /dev/null +++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd @@ -0,0 +1,74 @@ +%% Generated by autoinst on 2014/01/22 +%% +\ProvidesFile{TS1MerriweatherSans-TLF.fd} + [2014/01/22 (autoinst) Font definitions for TS1/MerriweatherSans-TLF.] + +\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax + \let\MerriweatherSans@@scale\@empty +\else + \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}% +\fi + +\DeclareFontFamily{TS1}{MerriweatherSans-TLF}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Light-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{l}{sl}{ + <-> ssub * MerriweatherSans-TLF/l/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{eb}{sl}{ + <-> ssub * MerriweatherSans-TLF/eb/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Bold-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{b}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{n}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Regular-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{it}{ + <-> \MerriweatherSans@@scale MerriweatherSans-Italic-tlf-ts1 +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{m}{sl}{ + <-> ssub * MerriweatherSans-TLF/m/it +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{sl}{ + <-> ssub * MerriweatherSans-TLF/b/sl +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{n}{ + <-> ssub * MerriweatherSans-TLF/b/n +}{} + +\DeclareFontShape{TS1}{MerriweatherSans-TLF}{bx}{it}{ + <-> ssub * MerriweatherSans-TLF/b/it +}{} + +\endinput diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty index db74160f0f3..cd4500fb662 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}[% - 2013/11/10 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] + 2014/01/22 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ] \RequirePackage{ifxetex,ifluatex,textcomp} @@ -53,11 +53,6 @@ % Set main and/or sans fonts: \ifmerriweather@ttf - \def\merriweather@rmboldstyle{Bold} - \def\merriweather@sfboldstyle{Bold} - \ifmerriweather@rmblack\def\merriweather@rmboldstyle{Heavy}\fi - \ifmerriweather@sfblack\def\merriweather@sfboldstyle{ExtraBold}\fi - \ifxetex\XeTeXtracingfonts=1\fi \defaultfontfeatures{ Ligatures = TeX , @@ -65,38 +60,128 @@ } \ifmerriweather@rm \ifmerriweather@rmlight - \setmainfont - [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} + \ifmerriweather@rmblack + \setmainfont + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \else + \setmainfont + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Light , + ItalicFont = *-LightIt , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \fi \else - \setmainfont - [ UprightFont = * , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} + \ifmerriweather@rmblack + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] + {Merriweather} + \else + \setmainfont + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \newfontfamily\merriweather + [ UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldIt ] + {Merriweather} + \fi \fi \fi \ifmerriweather@sf \ifmerriweather@sflight - \setsansfont - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} + \ifmerriweather@sfblack + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \else + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Light , + ItalicFont = *-LightItalic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \fi \else - \setsansfont - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} + \ifmerriweather@sfblack + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-ExtraBold , + BoldItalicFont = *-ExBoldIt ] + {MerriweatherSans} + \else + \setsansfont + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \newfontfamily\merriweathersans + [ Scale = \MerriweatherSans@scale , + UprightFont = *-Regular , + ItalicFont = *-Italic , + BoldFont = *-Bold , + BoldItalicFont = *-BoldItalic ] + {MerriweatherSans} + \fi \fi \fi % grab the \sfdefault in case it changes subsequently: @@ -104,43 +189,11 @@ \ifmerriweather@sfdefault \renewcommand*\familydefault{\merriweathersffamily} \fi - \ifmerriweather@rmlight - \newfontfamily\merriweather - [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} - \else - \newfontfamily\merriweather - [ UprightFont = * , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] - {Merriweather} - \fi - \ifmerriweather@sflight - \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} - \else - \newfontfamily\merriweathersans - [ Scale = \MerriweatherSans@scale , - UprightFont = *-Regular , - ItalicFont = *-Italic , - BoldFont = *-\merriweather@sfboldstyle , - BoldItalicFont = *-\merriweather@sfboldstyle Italic ] - {MerriweatherSans} - \fi \newfontfamily\merriweatherlight [ UprightFont = *-Light , - ItalicFont = *-LightItalic , - BoldFont = *-\merriweather@rmboldstyle , - BoldItalicFont = *-\merriweather@rmboldstyle Italic ] + ItalicFont = *-LightIt , + BoldFont = *-Light , + BoldItalicFont = *-LightIt ] {Merriweather} \newfontfamily\merriweathersanslight [ Scale = \MerriweatherSans@scale , @@ -150,24 +203,24 @@ BoldItalicFont = *-LightItalic ] {MerriweatherSans} \newfontfamily\merriweatherblack - [ UprightFont = *-Heavy , - ItalicFont = *-HeavyItalic , - BoldFont = *-Heavy , - BoldItalicFont = *-HeavyItalic ] + [ UprightFont = *-UltraBold , + ItalicFont = *-UltraBdIt , + BoldFont = *-UltraBold , + BoldItalicFont = *-UltraBdIt ] {Merriweather} \newfontfamily\merriweathersansblack [ Scale = \MerriweatherSans@scale , UprightFont = *-ExtraBold , - ItalicFont = *-ExtraBoldItalic , + ItalicFont = *-ExBoldIt , BoldFont = *-ExtraBold , - BoldItalicFont = *-ExtraBoldItalic ] + BoldItalicFont = *-ExBoldIt ] {MerriweatherSans} \else % type1 \ifmerriweather@rm \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi - \ifmerriweather@rmblack\def\bfseries@rm{h}\else\def\bfseries@rm{b}\fi + \ifmerriweather@rmblack\def\bfseries@rm{ub}\else\def\bfseries@rm{b}\fi \else \def\mdseries@rm{m}\def\bfseries@rm{b} \fi @@ -181,7 +234,7 @@ \def\merriweatherfamily{Merriweather-OsF} - \def\merriweathersffamily{MerriweatherSans-OsF} + \def\merriweathersffamily{MerriweatherSans-TLF} \ifmerriweather@rm \renewcommand*\rmdefault{\merriweatherfamily} @@ -201,7 +254,7 @@ \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont} \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont} \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont} - \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{h}\selectfont} + \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont} \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont} \fi -- cgit v1.2.3