merriweather (11nov13)

git-svn-id: svn://tug.org/texlive/trunk@32129 c570f23f-e606-0410-a88d-b1316a301751

10 files changed, 816 insertions, 0 deletions

diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
new file mode 100644
index 00000000000..0814f744ee5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
@@ -0,0 +1,74 @@
+%% Generated by autoinst on 2013/11/10
+%%
+\ProvidesFile{LY1Merriweather-OsF.fd}
+    [2013/11/10 (autoinst)  Font definitions for LY1/Merriweather-OsF.]
+
+\expandafter\ifx\csname Merriweather@scale\endcsname\relax
+    \let\Merriweather@@scale\@empty
+\else
+    \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriweather-OsF}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{
+      <-> \Merriweather@@scale Merriweather-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{
+      <-> \Merriweather@@scale Merriweather-LightItalic-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
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{
+      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{
+      <-> \Merriweather@@scale Merriweather-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{
+      <-> \Merriweather@@scale Merriweather-Italic-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{
+      <-> ssub * Merriweather-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{
+      <-> ssub * Merriweather-OsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{n}{
+      <-> ssub * Merriweather-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{it}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..5b878e18a03
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
@@ -0,0 +1,74 @@
+%% 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/Merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty
new file mode 100644
index 00000000000..5ad107a4760
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/Merriweather.sty
@@ -0,0 +1,39 @@
+%% 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
new file mode 100644
index 00000000000..2342ada7497
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
@@ -0,0 +1,74 @@
+%% Generated by autoinst on 2013/11/10
+%%
+\ProvidesFile{OT1Merriweather-OsF.fd}
+    [2013/11/10 (autoinst)  Font definitions for OT1/Merriweather-OsF.]
+
+\expandafter\ifx\csname Merriweather@scale\endcsname\relax
+    \let\Merriweather@@scale\@empty
+\else
+    \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriweather-OsF}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{
+      <-> \Merriweather@@scale Merriweather-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{
+      <-> \Merriweather@@scale Merriweather-LightItalic-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
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{
+      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{
+      <-> \Merriweather@@scale Merriweather-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{
+      <-> \Merriweather@@scale Merriweather-Italic-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{
+      <-> ssub * Merriweather-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{
+      <-> ssub * Merriweather-OsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{n}{
+      <-> ssub * Merriweather-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{it}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..a4d9063b5a4
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
@@ -0,0 +1,74 @@
+%% 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/T1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
new file mode 100644
index 00000000000..cae2e3a699a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd
@@ -0,0 +1,74 @@
+%% Generated by autoinst on 2013/11/10
+%%
+\ProvidesFile{T1Merriweather-OsF.fd}
+    [2013/11/10 (autoinst)  Font definitions for T1/Merriweather-OsF.]
+
+\expandafter\ifx\csname Merriweather@scale\endcsname\relax
+    \let\Merriweather@@scale\@empty
+\else
+    \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriweather-OsF}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{
+      <-> \Merriweather@@scale Merriweather-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{
+      <-> \Merriweather@@scale Merriweather-LightItalic-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
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{
+      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{
+      <-> \Merriweather@@scale Merriweather-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{
+      <-> \Merriweather@@scale Merriweather-Italic-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{
+      <-> ssub * Merriweather-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{
+      <-> ssub * Merriweather-OsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{bx}{n}{
+      <-> ssub * Merriweather-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriweather-OsF}{bx}{it}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..eef2f1d171a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
@@ -0,0 +1,74 @@
+%% 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/TS1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
new file mode 100644
index 00000000000..b136f111362
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
@@ -0,0 +1,74 @@
+%% Generated by autoinst on 2013/11/10
+%%
+\ProvidesFile{TS1Merriweather-OsF.fd}
+    [2013/11/10 (autoinst)  Font definitions for TS1/Merriweather-OsF.]
+
+\expandafter\ifx\csname Merriweather@scale\endcsname\relax
+    \let\Merriweather@@scale\@empty
+\else
+    \edef\Merriweather@@scale{s*[\csname Merriweather@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Merriweather-OsF}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
+      <-> \Merriweather@@scale Merriweather-Light-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
+      <-> \Merriweather@@scale Merriweather-LightItalic-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
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
+      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{
+      <-> \Merriweather@@scale Merriweather-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{
+      <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
+      <-> ssub * Merriweather-OsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
+      <-> ssub * Merriweather-OsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{n}{
+      <-> ssub * Merriweather-OsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{it}{
+      <-> ssub * Merriweather-OsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
new file mode 100644
index 00000000000..a42d873f4fc
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
@@ -0,0 +1,74 @@
+%% 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/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
new file mode 100644
index 00000000000..2f354427424
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
@@ -0,0 +1,185 @@
+\ProvidesPackage{merriweather}[%
+   2013/11/10 (Bob Tennent)  Supports Merriweather(Sans) fonts for all LaTeX engines. ] 
+
+\RequirePackage{ifxetex,ifluatex,textcomp}
+
+\newif\ifmerriweather@ttf
+\ifxetex
+  \merriweather@ttftrue
+\else\ifluatex
+  \merriweather@ttftrue
+\else  % [pdf]LaTeX
+  \merriweather@ttffalse
+\fi\fi
+
+\newcommand*{\Merriweather@scale}{1}  % not adjustable
+\newcommand*{\MerriweatherSans@scale}{1}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scaled}{\renewcommand*{\MerriweatherSans@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\MerriweatherSans@scale}{#1}}
+
+\newif\ifmerriweather@rm \merriweather@rmfalse
+\newif\ifmerriweather@sf \merriweather@sffalse
+\newif\ifmerriweather@sfdefault \merriweather@sfdefaultfalse
+\newif\ifmerriweather@rmlight \merriweather@rmlightfalse
+\newif\ifmerriweather@sflight \merriweather@sflightfalse
+\newif\ifmerriweather@rmblack \merriweather@rmblackfalse
+\newif\ifmerriweather@sfblack \merriweather@sfblackfalse
+
+\DeclareOptionX{sf}{\merriweather@sftrue}
+\DeclareOptionX{rm}{\merriweather@rmtrue}
+\DeclareOptionX{sfdefault}{\merriweather@sftrue\merriweather@sfdefaulttrue}
+\DeclareOptionX{type1}{\merriweather@ttffalse}
+\DeclareOptionX{light}{\merriweather@rmlighttrue\merriweather@sflighttrue}
+\DeclareOptionX{rmlight}{\merriweather@rmlighttrue}
+\DeclareOptionX{sflight}{\merriweather@sflighttrue}
+\DeclareOptionX{black}{\merriweather@rmblacktrue\merriweather@sfblacktrue}
+\DeclareOptionX{rmblack}{\merriweather@rmblacktrue}
+\DeclareOptionX{sfblack}{\merriweather@sfblacktrue}
+
+\ProcessOptionsX\relax
+
+\ifmerriweather@ttf
+  \RequirePackage{fontspec}
+\else
+  \RequirePackage{fontenc,fontaxes,mweights}
+\fi
+
+\ifmerriweather@rm\else\ifmerriweather@sf\else
+  \merriweather@rmtrue\merriweather@sftrue  % both false -> both true
+\fi\fi
+
+
+% 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 ,
+     Extension = .ttf ,
+  }
+  \ifmerriweather@rm
+    \ifmerriweather@rmlight
+      \setmainfont
+          [ UprightFont    = *-Light ,
+            ItalicFont     = *-LightItalic ,
+            BoldFont       = *-\merriweather@rmboldstyle , 
+            BoldItalicFont = *-\merriweather@rmboldstyle Italic ]
+          {Merriweather}
+    \else
+      \setmainfont
+          [ UprightFont    = * ,
+            ItalicFont     = *-Italic ,
+            BoldFont       = *-\merriweather@rmboldstyle , 
+            BoldItalicFont = *-\merriweather@rmboldstyle Italic ]
+          {Merriweather}
+    \fi
+  \fi
+  \ifmerriweather@sf
+    \ifmerriweather@sflight
+      \setsansfont
+          [ Scale     = \MerriweatherSans@scale ,
+            UprightFont    = *-Light ,
+            ItalicFont     = *-LightItalic ,
+            BoldFont       = *-\merriweather@sfboldstyle , 
+            BoldItalicFont = *-\merriweather@sfboldstyle Italic ]  
+          {MerriweatherSans}
+    \else
+      \setsansfont
+          [ Scale     = \MerriweatherSans@scale ,
+            UprightFont    = *-Regular ,
+            ItalicFont     = *-Italic ,
+            BoldFont       = *-\merriweather@sfboldstyle , 
+            BoldItalicFont = *-\merriweather@sfboldstyle Italic ]  
+          {MerriweatherSans}
+    \fi
+  \fi
+  % grab the \sfdefault in case it changes subsequently:
+  \let\merriweathersffamily\sfdefault
+  \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
+
+\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
+  \else
+    \def\mdseries@rm{m}\def\bfseries@rm{b}
+  \fi
+  \ifmerriweather@sf
+    \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
+
+
+
+  \def\merriweatherfamily{Merriweather-OsF}
+  \def\merriweathersffamily{MerriweatherSans-OsF}
+
+  \ifmerriweather@rm
+    \renewcommand*\rmdefault{\merriweatherfamily}
+  \fi
+
+  \ifmerriweather@sf
+    \renewcommand*\sfdefault{\merriweathersffamily}
+  \fi
+
+  \ifmerriweather@sfdefault
+    \renewcommand*\familydefault{\merriweathersffamily}
+  \fi
+  
+  \renewcommand*\seriesdefault{\mdseries@rm}
+
+  \newcommand*\merriweather{\fontfamily{\merriweatherfamily}\selectfont}
+  \newcommand*\merriweathersans{\fontfamily{\merriweathersffamily}\selectfont}
+
+\fi
+
+% turn off defaults in case other fonts are selected:
+\ifmerriweather@ttf
+  \defaultfontfeatures{}
+\fi
+
+\endinput
+