summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/merriweather
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-06-03 21:33:51 +0000
committerKarl Berry <karl@freefriends.org>2019-06-03 21:33:51 +0000
commitfc8f29d934152a1aafa862d142c7bf8c84e48e43 (patch)
tree9c69bdc74ac49088ae8913b4bbf28d532ab8884c /Master/texmf-dist/tex/latex/merriweather
parentd2b9a5a0e6dc27cfe4b8a7e4b204b5ac8fafe9e7 (diff)
merriweather (3jun19)
git-svn-id: svn://tug.org/texlive/trunk@51304 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/merriweather')
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd119
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd149
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd74
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/merriweather.sty20
16 files changed, 1441 insertions, 394 deletions
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriweather-OsF.fd
index 2b118321df5..d7b8c6adec7 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 2014/01/24
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{LY1Merriweather-OsF.fd}
- [2014/01/24 (autoinst) Font definitions for LY1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for LY1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{LY1}{Merriweather-OsF}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{
+
+% ---- 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}{l}{it}{
+\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/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{LY1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ly1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{LY1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ly1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ly1
+\DeclareFontShape{LY1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{LY1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{LY1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/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
}{}
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..1d190f586a3
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% 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/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd
new file mode 100644
index 00000000000..094d4e2e46c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-Sup.fd
@@ -0,0 +1,149 @@
+%% 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/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd
deleted file mode 100644
index 0b5642a3b3e..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% 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/OT1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriweather-OsF.fd
index 31ea2fc671b..1a8a932b03b 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 2014/01/22
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{OT1Merriweather-OsF.fd}
- [2014/01/22 (autoinst) Font definitions for OT1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for OT1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{OT1}{Merriweather-OsF}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{
+
+% ---- 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}{l}{it}{
+\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/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{OT1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ot1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{OT1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ot1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ot1
+\DeclareFontShape{OT1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{OT1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{OT1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/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
}{}
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..e1c734a399c
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% 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/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd
new file mode 100644
index 00000000000..77b60c88bd7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-Sup.fd
@@ -0,0 +1,149 @@
+%% 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/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd
deleted file mode 100644
index 8b257f4a70e..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% 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 93b7b387d71..46a6c51e0a6 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 2014/01/22
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{T1Merriweather-OsF.fd}
- [2014/01/22 (autoinst) Font definitions for T1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for T1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{T1}{Merriweather-OsF}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{
+
+% ---- 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}{l}{it}{
+\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/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{T1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-t1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{T1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-t1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-t1
+\DeclareFontShape{T1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{T1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{T1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/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
}{}
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..6ee2d25c10b
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% 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/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd
new file mode 100644
index 00000000000..eef4eab37b7
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-Sup.fd
@@ -0,0 +1,149 @@
+%% 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/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd
deleted file mode 100644
index b0e0be3a0d2..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/T1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% 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 75dd3b220ce..7f86bea703f 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 2014/01/22
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{TS1Merriweather-OsF.fd}
- [2014/01/22 (autoinst) Font definitions for TS1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for TS1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{TS1}{Merriweather-OsF}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
+
+% ---- 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}{l}{it}{
+\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/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ts1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/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
}{}
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..26cbcb5cfe6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-OsF.fd
@@ -0,0 +1,149 @@
+%% 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/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd
deleted file mode 100644
index b8a6fdde783..00000000000
--- a/Master/texmf-dist/tex/latex/merriweather/TS1MerriweatherSans-TLF.fd
+++ /dev/null
@@ -1,74 +0,0 @@
-%% 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 cd4500fb662..231fc152c1b 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}[%
- 2014/01/22 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
+ 2019/06/02 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
@@ -219,14 +219,14 @@
\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
+ \ifmerriweather@rmlight\def\mdseries@rm{light}\else\def\mdseries@rm{regular}\fi
+ \ifmerriweather@rmblack\def\bfseries@rm{ultrabold}\else\def\bfseries@rm{bold}\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
+ \ifmerriweather@sflight\def\mdseries@sf{light}\else\def\mdseries@sf{regular}\fi
+ \ifmerriweather@sfblack\def\bfseries@sf{extrabold}\else\def\bfseries@sf{bold}\fi
\else
\def\mdseries@sf{m}\def\bfseries@sf{b}
\fi
@@ -234,7 +234,7 @@
\def\merriweatherfamily{Merriweather-OsF}
- \def\merriweathersffamily{MerriweatherSans-TLF}
+ \def\merriweathersffamily{MerriweatherSans-OsF}
\ifmerriweather@rm
\renewcommand*\rmdefault{\merriweatherfamily}
@@ -252,10 +252,10 @@
\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}
+ \newcommand*\merriweatherlight{\fontfamily{\merriweatherfamily}\fontseries{light}\selectfont}
+ \newcommand*\merriweathersanslight{\fontfamily{\merriweathersffamily}\fontseries{light}\selectfont}
+ \newcommand*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{ultrabold}\selectfont}
+ \newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{extrabold}\selectfont}
\fi