CTAN sync 202007260302

12 files changed, 9 insertions, 1700 deletions

diff --git a/fonts/merriweather/latex/LY1Merriweather-OsF.fd b/fonts/merriweather/latex/LY1Merriweather-OsF.fd
deleted file mode 100644
index d7b8c6adec..0000000000
--- a/fonts/merriweather/latex/LY1Merriweather-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{LY1Merriweather-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{n}{
-      <-> \Merriweather@@scale Merriweather-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{it}{
-      <-> \Merriweather@@scale Merriweather-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{regular}{sl}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{n}{
-      <-> \Merriweather@@scale Merriweather-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{it}{
-      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bold}{sl}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{light}{n}{
-      <-> \Merriweather@@scale Merriweather-Light-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{light}{it}{
-      <-> \Merriweather@@scale Merriweather-LightIt-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{light}{sl}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   ----  ultrabold  ----
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{n}{
-      <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{it}{
-      <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ultrabold}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{sl}{
-      <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{
-      <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{
-      <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{
-      <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{
-      <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{
-      <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ub --> ultrabold
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{
-      <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{n}{
-      <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{
-      <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{it}{
-      <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/LY1MerriweatherSans-OsF.fd b/fonts/merriweather/latex/LY1MerriweatherSans-OsF.fd
deleted file mode 100644
index 1d190f586a..0000000000
--- a/fonts/merriweather/latex/LY1MerriweatherSans-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{LY1MerriweatherSans-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{regular}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{light}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{extrabold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{n}{
-      <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{l}{it}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{n}{
-      <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{m}{it}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{n}{
-      <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{b}{it}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   eb --> extrabold
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{n}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{eb}{it}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{n}{
-      <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{sl}{
-      <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-OsF}{bx}{it}{
-      <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/LY1MerriweatherSans-Sup.fd b/fonts/merriweather/latex/LY1MerriweatherSans-Sup.fd
deleted file mode 100644
index 094d4e2e46..0000000000
--- a/fonts/merriweather/latex/LY1MerriweatherSans-Sup.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{LY1MerriweatherSans-Sup.fd}
-    [2019/06/02 (autoinst)  Font definitions for LY1/MerriweatherSans-Sup.]
-
-\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
-    \let\MerriweatherSans@@scale\@empty
-\else
-    \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{LY1}{MerriweatherSans-Sup}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{regular}{sl}{
-      <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bold}{sl}{
-      <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{light}{sl}{
-      <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ly1
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{extrabold}{sl}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{sl}{
-      <-> ssub * MerriweatherSans-Sup/light/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{n}{
-      <-> ssub * MerriweatherSans-Sup/light/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{l}{it}{
-      <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{sl}{
-      <-> ssub * MerriweatherSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{n}{
-      <-> ssub * MerriweatherSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{m}{it}{
-      <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{sl}{
-      <-> ssub * MerriweatherSans-Sup/bold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{n}{
-      <-> ssub * MerriweatherSans-Sup/bold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{b}{it}{
-      <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-%   eb --> extrabold
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{sl}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{n}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{eb}{it}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{n}{
-      <-> ssub * MerriweatherSans-Sup/b/n
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{sl}{
-      <-> ssub * MerriweatherSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{LY1}{MerriweatherSans-Sup}{bx}{it}{
-      <-> ssub * MerriweatherSans-Sup/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/OT1Merriweather-OsF.fd b/fonts/merriweather/latex/OT1Merriweather-OsF.fd
deleted file mode 100644
index 1a8a932b03..0000000000
--- a/fonts/merriweather/latex/OT1Merriweather-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{OT1Merriweather-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{n}{
-      <-> \Merriweather@@scale Merriweather-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{it}{
-      <-> \Merriweather@@scale Merriweather-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{regular}{sl}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{n}{
-      <-> \Merriweather@@scale Merriweather-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{it}{
-      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bold}{sl}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{light}{n}{
-      <-> \Merriweather@@scale Merriweather-Light-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{light}{it}{
-      <-> \Merriweather@@scale Merriweather-LightIt-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{light}{sl}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   ----  ultrabold  ----
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{n}{
-      <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{it}{
-      <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ultrabold}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{sl}{
-      <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{
-      <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{
-      <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{
-      <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{
-      <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{
-      <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ub --> ultrabold
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{
-      <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{n}{
-      <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{
-      <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{it}{
-      <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/OT1MerriweatherSans-OsF.fd b/fonts/merriweather/latex/OT1MerriweatherSans-OsF.fd
deleted file mode 100644
index e1c734a399..0000000000
--- a/fonts/merriweather/latex/OT1MerriweatherSans-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{OT1MerriweatherSans-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{regular}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{light}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{extrabold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{n}{
-      <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{l}{it}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{n}{
-      <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{m}{it}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{n}{
-      <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{b}{it}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   eb --> extrabold
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{n}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{eb}{it}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{n}{
-      <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{sl}{
-      <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-OsF}{bx}{it}{
-      <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/OT1MerriweatherSans-Sup.fd b/fonts/merriweather/latex/OT1MerriweatherSans-Sup.fd
deleted file mode 100644
index 77b60c88bd..0000000000
--- a/fonts/merriweather/latex/OT1MerriweatherSans-Sup.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{OT1MerriweatherSans-Sup.fd}
-    [2019/06/02 (autoinst)  Font definitions for OT1/MerriweatherSans-Sup.]
-
-\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
-    \let\MerriweatherSans@@scale\@empty
-\else
-    \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{OT1}{MerriweatherSans-Sup}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{regular}{sl}{
-      <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bold}{sl}{
-      <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{light}{sl}{
-      <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-ot1
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{extrabold}{sl}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{sl}{
-      <-> ssub * MerriweatherSans-Sup/light/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{n}{
-      <-> ssub * MerriweatherSans-Sup/light/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{l}{it}{
-      <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{sl}{
-      <-> ssub * MerriweatherSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{n}{
-      <-> ssub * MerriweatherSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{m}{it}{
-      <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{sl}{
-      <-> ssub * MerriweatherSans-Sup/bold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{n}{
-      <-> ssub * MerriweatherSans-Sup/bold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{b}{it}{
-      <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-%   eb --> extrabold
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{sl}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{n}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{eb}{it}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{n}{
-      <-> ssub * MerriweatherSans-Sup/b/n
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{sl}{
-      <-> ssub * MerriweatherSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{OT1}{MerriweatherSans-Sup}{bx}{it}{
-      <-> ssub * MerriweatherSans-Sup/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/T1Merriweather-OsF.fd b/fonts/merriweather/latex/T1Merriweather-OsF.fd
deleted file mode 100644
index 46a6c51e0a..0000000000
--- a/fonts/merriweather/latex/T1Merriweather-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{T1Merriweather-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{regular}{n}{
-      <-> \Merriweather@@scale Merriweather-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{regular}{it}{
-      <-> \Merriweather@@scale Merriweather-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{regular}{sl}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bold}{n}{
-      <-> \Merriweather@@scale Merriweather-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bold}{it}{
-      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bold}{sl}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{light}{n}{
-      <-> \Merriweather@@scale Merriweather-Light-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{light}{it}{
-      <-> \Merriweather@@scale Merriweather-LightIt-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{light}{sl}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   ----  ultrabold  ----
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{n}{
-      <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{it}{
-      <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ultrabold}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{sl}{
-      <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{
-      <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{
-      <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{
-      <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{
-      <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{
-      <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ub --> ultrabold
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{
-      <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{n}{
-      <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{
-      <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{it}{
-      <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/T1MerriweatherSans-OsF.fd b/fonts/merriweather/latex/T1MerriweatherSans-OsF.fd
deleted file mode 100644
index 6ee2d25c10..0000000000
--- a/fonts/merriweather/latex/T1MerriweatherSans-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{T1MerriweatherSans-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{regular}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{light}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{extrabold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{n}{
-      <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{l}{it}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{n}{
-      <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{m}{it}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{n}{
-      <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{b}{it}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   eb --> extrabold
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{n}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{eb}{it}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{n}{
-      <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{sl}{
-      <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-OsF}{bx}{it}{
-      <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/T1MerriweatherSans-Sup.fd b/fonts/merriweather/latex/T1MerriweatherSans-Sup.fd
deleted file mode 100644
index eef4eab37b..0000000000
--- a/fonts/merriweather/latex/T1MerriweatherSans-Sup.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{T1MerriweatherSans-Sup.fd}
-    [2019/06/02 (autoinst)  Font definitions for T1/MerriweatherSans-Sup.]
-
-\expandafter\ifx\csname MerriweatherSans@scale\endcsname\relax
-    \let\MerriweatherSans@@scale\@empty
-\else
-    \edef\MerriweatherSans@@scale{s*[\csname MerriweatherSans@scale\endcsname]}%
-\fi
-
-\DeclareFontFamily{T1}{MerriweatherSans-Sup}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Regular-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Italic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{regular}{sl}{
-      <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Bold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bold}{sl}{
-      <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Light-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{light}{sl}{
-      <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-sup-t1
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{extrabold}{sl}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{sl}{
-      <-> ssub * MerriweatherSans-Sup/light/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{n}{
-      <-> ssub * MerriweatherSans-Sup/light/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{l}{it}{
-      <-> ssub * MerriweatherSans-Sup/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{sl}{
-      <-> ssub * MerriweatherSans-Sup/regular/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{n}{
-      <-> ssub * MerriweatherSans-Sup/regular/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{m}{it}{
-      <-> ssub * MerriweatherSans-Sup/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{sl}{
-      <-> ssub * MerriweatherSans-Sup/bold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{n}{
-      <-> ssub * MerriweatherSans-Sup/bold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{b}{it}{
-      <-> ssub * MerriweatherSans-Sup/bold/it
-}{}
-
-
-%   eb --> extrabold
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{sl}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{n}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{eb}{it}{
-      <-> ssub * MerriweatherSans-Sup/extrabold/it
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{n}{
-      <-> ssub * MerriweatherSans-Sup/b/n
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{sl}{
-      <-> ssub * MerriweatherSans-Sup/b/sl
-}{}
-
-\DeclareFontShape{T1}{MerriweatherSans-Sup}{bx}{it}{
-      <-> ssub * MerriweatherSans-Sup/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/TS1Merriweather-OsF.fd b/fonts/merriweather/latex/TS1Merriweather-OsF.fd
deleted file mode 100644
index 7f86bea703..0000000000
--- a/fonts/merriweather/latex/TS1Merriweather-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{TS1Merriweather-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{n}{
-      <-> \Merriweather@@scale Merriweather-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{it}{
-      <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{sl}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{n}{
-      <-> \Merriweather@@scale Merriweather-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{it}{
-      <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{sl}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{light}{n}{
-      <-> \Merriweather@@scale Merriweather-Light-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{light}{it}{
-      <-> \Merriweather@@scale Merriweather-LightIt-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{light}{sl}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   ----  ultrabold  ----
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{n}{
-      <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{it}{
-      <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{sl}{
-      <-> ssub * Merriweather-OsF/light/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
-      <-> ssub * Merriweather-OsF/light/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
-      <-> ssub * Merriweather-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
-      <-> ssub * Merriweather-OsF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{
-      <-> ssub * Merriweather-OsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{
-      <-> ssub * Merriweather-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
-      <-> ssub * Merriweather-OsF/bold/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
-      <-> ssub * Merriweather-OsF/bold/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
-      <-> ssub * Merriweather-OsF/bold/it
-}{}
-
-
-%   ub --> ultrabold
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{
-      <-> ssub * Merriweather-OsF/ultrabold/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{
-      <-> ssub * Merriweather-OsF/ultrabold/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{
-      <-> ssub * Merriweather-OsF/ultrabold/it
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{n}{
-      <-> ssub * Merriweather-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
-      <-> ssub * Merriweather-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{it}{
-      <-> ssub * Merriweather-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/TS1MerriweatherSans-OsF.fd b/fonts/merriweather/latex/TS1MerriweatherSans-OsF.fd
deleted file mode 100644
index 26cbcb5cfe..0000000000
--- a/fonts/merriweather/latex/TS1MerriweatherSans-OsF.fd
+++ /dev/null
@@ -1,149 +0,0 @@
-%% Generated by autoinst on 2019/06/02
-%%
-\ProvidesFile{TS1MerriweatherSans-OsF.fd}
-    [2019/06/02 (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}{}
-
-
-%   ----  regular  ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Regular-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Italic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{regular}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   ----  bold  ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Bold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-BoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   ----  light  ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-Light-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-LightItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{light}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   ----  extrabold  ----
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{n}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBold-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{it}{
-      <-> \MerriweatherSans@@scale MerriweatherSans-ExtraBoldItalic-osf-ts1
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{extrabold}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-%
-%  Extra 'ssub' rules to map the standard NFSS codes to our fancy names
-%
-
-%   l --> light
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{sl}{
-      <-> ssub * MerriweatherSans-OsF/light/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{n}{
-      <-> ssub * MerriweatherSans-OsF/light/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{l}{it}{
-      <-> ssub * MerriweatherSans-OsF/light/it
-}{}
-
-
-%   m --> regular
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{sl}{
-      <-> ssub * MerriweatherSans-OsF/regular/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{n}{
-      <-> ssub * MerriweatherSans-OsF/regular/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{m}{it}{
-      <-> ssub * MerriweatherSans-OsF/regular/it
-}{}
-
-
-%   b --> bold
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{sl}{
-      <-> ssub * MerriweatherSans-OsF/bold/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{n}{
-      <-> ssub * MerriweatherSans-OsF/bold/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{b}{it}{
-      <-> ssub * MerriweatherSans-OsF/bold/it
-}{}
-
-
-%   eb --> extrabold
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{sl}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{n}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{eb}{it}{
-      <-> ssub * MerriweatherSans-OsF/extrabold/it
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{n}{
-      <-> ssub * MerriweatherSans-OsF/b/n
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{sl}{
-      <-> ssub * MerriweatherSans-OsF/b/sl
-}{}
-
-\DeclareFontShape{TS1}{MerriweatherSans-OsF}{bx}{it}{
-      <-> ssub * MerriweatherSans-OsF/b/it
-}{}
-
-\endinput
diff --git a/fonts/merriweather/latex/merriweather.sty b/fonts/merriweather/latex/merriweather.sty
index 6f2f5e07e6..0fd1696f61 100644
--- a/fonts/merriweather/latex/merriweather.sty
+++ b/fonts/merriweather/latex/merriweather.sty
@@ -1,16 +1,14 @@
 \ProvidesPackage{merriweather}[%
-   2019/10/13 (Bob Tennent)  Supports Merriweather(Sans) fonts for all LaTeX engines. ] 
+   2020/07/24 (Bob Tennent)  Supports Merriweather(Sans) fonts for use with xeLaTeX and luaLaTeX. ] 
 
-\RequirePackage{ifxetex,ifluatex,textcomp}
+\RequirePackage{iftex}
 
-\newif\ifmerriweather@ttf
-\ifxetex
-  \merriweather@ttftrue
-\else\ifluatex
-  \merriweather@ttftrue
-\else  % [pdf]LaTeX
-  \merriweather@ttffalse
-\fi\fi
+\ifpdftex
+\PackageError{merriweather}{%
+ *****************************************\MessageBreak
+  Please process using XeLaTeX or luaLaTeX\MessageBreak
+ *****************************************}
+\fi  
 
 \newcommand*{\Merriweather@scale}{1}  % not adjustable
 \newcommand*{\MerriweatherSans@scale}{1}
@@ -29,7 +27,6 @@
 \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}
@@ -39,11 +36,7 @@
 
 \ProcessOptionsX\relax
 
-\ifmerriweather@ttf
-  \RequirePackage{fontspec}
-\else
-  \RequirePackage{fontenc,fontaxes,mweights}
-\fi
+\RequirePackage{fontspec}
 
 \ifmerriweather@rm\else\ifmerriweather@sf\else
   \merriweather@rmtrue\merriweather@sftrue  % both false -> both true
@@ -51,7 +44,6 @@
 
 
 % Set main and/or sans fonts:
-\ifmerriweather@ttf
 
   \ifxetex\XeTeXtracingfonts=1\fi
   \defaultfontfeatures{
@@ -216,53 +208,9 @@
         BoldItalicFont = *-ExBoldIt ]  
       {MerriweatherSans}
 
-\else % type1
-
-  \ifmerriweather@rm
-    \ifmerriweather@rmlight\def\mdseries@rm{l}\else\def\mdseries@rm{m}\fi
-    \ifmerriweather@rmblack\def\bfseries@rm{ub}\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}
-  \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{l}\selectfont}
-  \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{l}\selectfont}
-  \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ub}\selectfont}
-  \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont}
-
-\fi
 
 % turn off defaults in case other fonts are selected:
-\ifmerriweather@ttf
   \defaultfontfeatures{}
-\fi
 
 \endinput