summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-08-31 21:17:18 +0000
committerKarl Berry <karl@freefriends.org>2020-08-31 21:17:18 +0000
commit2654b31b81dc0bda222b73f705f6504608d073ae (patch)
tree487628dba5ada654ca0e6e71fe7c31473a8f801f /Master/texmf-dist/tex/latex
parent93929eb6e4cf9eed48e89c372890b79f5b4fb608 (diff)
merriweather (31aug20)
git-svn-id: svn://tug.org/texlive/trunk@56220 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-LF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-OsF.fd212
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-Sup.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TLF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TOsF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-LF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd208
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd120
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TLF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TOsF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-LF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd212
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-Sup.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TLF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TOsF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-LF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd208
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd120
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TLF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TOsF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-LF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd212
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-Sup.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TLF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TOsF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-LF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd208
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd120
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TLF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TOsF.fd253
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-LF.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd124
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TLF.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TOsF.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-LF.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd120
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TLF.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TOsF.fd145
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/merriweather.sty251
39 files changed, 7238 insertions, 736 deletions
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-LF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-LF.fd
new file mode 100644
index 00000000000..00eafb89bec
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{sc}{
+ <-> alias * Merriwthr-LF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{scit}{
+ <-> alias * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{scsl}{
+ <-> ssub * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{scsl}{
+ <-> ssub * Merriwthr-LF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{sc}{
+ <-> alias * Merriwthr-LF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{scit}{
+ <-> alias * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{scsl}{
+ <-> ssub * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{scsl}{
+ <-> ssub * Merriwthr-LF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{sc}{
+ <-> alias * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{scit}{
+ <-> alias * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{scsl}{
+ <-> ssub * Merriwthr-LF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{sc}{
+ <-> alias * Merriwthr-LF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{scit}{
+ <-> alias * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{scsl}{
+ <-> ssub * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{scsl}{
+ <-> ssub * Merriwthr-LF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{sc}{
+ <-> ssub * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-LF}{bx}{scit}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-OsF.fd
index 05e55d7c69c..23426700c40 100644
--- a/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{LY1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for LY1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{LY1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{sc}{
+ <-> alias * Merriwthr-OsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{it}{
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{it}{
<-> \Merriwthr@@scale Merriwthr-Italic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-sc-ly1
+}{}
-% ---- bold ----
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{scit}{
+ <-> alias * Merriwthr-OsF/m/scit
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{scsl}{
+ <-> ssub * Merriwthr-OsF/m/scit
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-OsF/regular/scit
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{sc}{
+ <-> alias * Merriwthr-OsF/eb/sc
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-ly1
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
+}{}
-% ---- ultrabold ----
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-ly1
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ly1
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{scit}{
+ <-> alias * Merriwthr-OsF/eb/scit
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-OsF/eb/scit
+}{}
-% l --> light
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{scsl}{
+ <-> ssub * Merriwthr-OsF/black/scit
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{LY1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-sc-ly1
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{sc}{
+ <-> alias * Merriwthr-OsF/b/sc
+}{}
-% m --> regular
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-ly1
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-sc-ly1
+}{}
-% b --> bold
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{scit}{
+ <-> alias * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-OsF/bold/scit
+}{}
\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{sc}{
+ <-> alias * Merriwthr-OsF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-ly1
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{scit}{
+ <-> alias * Merriwthr-OsF/l/scit
+}{}
-% ub --> ultrabold
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{scsl}{
+ <-> ssub * Merriwthr-OsF/l/scit
+}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{scsl}{
+ <-> ssub * Merriwthr-OsF/light/scit
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{LY1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{LY1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{LY1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{sc}{
+ <-> ssub * Merriwthr-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scsl
+}{}
+
\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{sl}{
<-> ssub * Merriwthr-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{LY1}{Merriwthr-OsF}{bx}{scit}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-Sup.fd
new file mode 100644
index 00000000000..4dca64a0873
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-Sup.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-Sup.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{regular}{n}{
+ <-> alias * Merriwthr-Sup/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{regular}{it}{
+ <-> alias * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{m}{sl}{
+ <-> ssub * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{regular}{sl}{
+ <-> ssub * Merriwthr-Sup/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{black}{n}{
+ <-> alias * Merriwthr-Sup/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{black}{it}{
+ <-> alias * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{eb}{sl}{
+ <-> ssub * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{black}{sl}{
+ <-> ssub * Merriwthr-Sup/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bold}{n}{
+ <-> alias * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bold}{it}{
+ <-> alias * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{b}{sl}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bold}{sl}{
+ <-> ssub * Merriwthr-Sup/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{light}{n}{
+ <-> alias * Merriwthr-Sup/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{light}{it}{
+ <-> alias * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{l}{sl}{
+ <-> ssub * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{light}{sl}{
+ <-> ssub * Merriwthr-Sup/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bx}{n}{
+ <-> ssub * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bx}{sl}{
+ <-> ssub * Merriwthr-Sup/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-Sup}{bx}{it}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TLF.fd
new file mode 100644
index 00000000000..d82f8ff2fa8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{sc}{
+ <-> alias * Merriwthr-TLF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{scit}{
+ <-> alias * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{scsl}{
+ <-> ssub * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TLF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{sc}{
+ <-> alias * Merriwthr-TLF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{scit}{
+ <-> alias * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{scsl}{
+ <-> ssub * Merriwthr-TLF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{sc}{
+ <-> alias * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{scit}{
+ <-> alias * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{sc}{
+ <-> alias * Merriwthr-TLF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{scit}{
+ <-> alias * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{scsl}{
+ <-> ssub * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{scsl}{
+ <-> ssub * Merriwthr-TLF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{sc}{
+ <-> ssub * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TLF}{bx}{scit}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TOsF.fd
new file mode 100644
index 00000000000..827a95951fa
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1Merriwthr-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{sc}{
+ <-> alias * Merriwthr-TOsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{scit}{
+ <-> alias * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{scsl}{
+ <-> ssub * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{sc}{
+ <-> alias * Merriwthr-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{scit}{
+ <-> alias * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{scsl}{
+ <-> ssub * Merriwthr-TOsF/black/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{sc}{
+ <-> alias * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{scit}{
+ <-> alias * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{sc}{
+ <-> alias * Merriwthr-TOsF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{scit}{
+ <-> alias * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{scsl}{
+ <-> ssub * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{scsl}{
+ <-> ssub * Merriwthr-TOsF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{sc}{
+ <-> ssub * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{Merriwthr-TOsF}{bx}{scit}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-LF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-LF.fd
new file mode 100644
index 00000000000..dfda0be5312
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{sc}{
+ <-> alias * MerriwthrSans-LF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{scit}{
+ <-> alias * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-LF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{sc}{
+ <-> alias * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{scit}{
+ <-> alias * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{sc}{
+ <-> alias * MerriwthrSans-LF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{scit}{
+ <-> alias * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-LF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-LF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-LF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd
index d29d07c99e6..bec4c551bc6 100644
--- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{LY1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for LY1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{LY1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-OsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{it}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ly1
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
+}{}
+
\DeclareFontShape{LY1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- bold ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{n}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{it}{
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-sc-ly1
+}{}
-% ---- light ----
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-OsF/b/scit
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/bold/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-% ---- extrabold ----
+% ---- l = light ----
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{sc}{
+ <-> alias * MerriwthrSans-OsF/l/sc
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ly1
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
+}{}
-% l --> light
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ly1
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{scit}{
+ <-> alias * MerriwthrSans-OsF/l/scit
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/l/scit
+}{}
-% m --> regular
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/light/scit
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-sc-ly1
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-OsF/eb/sc
+}{}
-% b --> bold
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ly1
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-sc-ly1
+}{}
-% eb --> extrabold
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-OsF/eb/scit
+}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/eb/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/scit
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scsl
+}{}
+
\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{sl}{
<-> ssub * MerriwthrSans-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{LY1}{MerriwthrSans-OsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd
index f17c9b867dc..f58c5560d69 100644
--- a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{LY1MerriwthrSans-Sup.fd}
- [2020/07/30 (autoinst) Font definitions for LY1/MerriwthrSans-Sup.]
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{LY1}{MerriwthrSans-Sup}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{n}{
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{n}{
+ <-> alias * MerriwthrSans-Sup/m/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{sl}{
- <-> ssub * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ly1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{it}{
+ <-> alias * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{sl}{
+ <-> ssub * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{sl}{
- <-> ssub * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{regular}{sl}{
+ <-> ssub * MerriwthrSans-Sup/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{n}{
+ <-> alias * MerriwthrSans-Sup/b/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{sl}{
- <-> ssub * MerriwthrSans-Sup/light/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ly1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{it}{
+ <-> alias * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ly1
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{sl}{
+ <-> ssub * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-Sup/extrabold/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{sl}{
- <-> alias * MerriwthrSans-Sup/light/sl
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{n}{
- <-> alias * MerriwthrSans-Sup/light/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{n}{
+ <-> alias * MerriwthrSans-Sup/l/n
}{}
\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{it}{
- <-> alias * MerriwthrSans-Sup/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ly1
}{}
-
-% m --> regular
-
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{sl}{
- <-> alias * MerriwthrSans-Sup/regular/sl
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{it}{
+ <-> alias * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{n}{
- <-> alias * MerriwthrSans-Sup/regular/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{l}{sl}{
+ <-> ssub * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{m}{it}{
- <-> alias * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{light}{sl}{
+ <-> ssub * MerriwthrSans-Sup/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{sl}{
- <-> alias * MerriwthrSans-Sup/bold/sl
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ly1
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{n}{
- <-> alias * MerriwthrSans-Sup/bold/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{n}{
+ <-> alias * MerriwthrSans-Sup/eb/n
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{b}{it}{
- <-> alias * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ly1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{it}{
+ <-> alias * MerriwthrSans-Sup/eb/it
+}{}
\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{sl}{
- <-> alias * MerriwthrSans-Sup/extrabold/sl
+ <-> ssub * MerriwthrSans-Sup/eb/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{n}{
- <-> alias * MerriwthrSans-Sup/extrabold/n
+\DeclareFontShape{LY1}{MerriwthrSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/extrabold/it
}{}
-\DeclareFontShape{LY1}{MerriwthrSans-Sup}{eb}{it}{
- <-> alias * MerriwthrSans-Sup/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{LY1}{MerriwthrSans-Sup}{bx}{n}{
<-> ssub * MerriwthrSans-Sup/b/n
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TLF.fd
new file mode 100644
index 00000000000..c2c26aff66e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TLF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{sc}{
+ <-> alias * MerriwthrSans-TLF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{scit}{
+ <-> alias * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TLF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TLF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TOsF.fd
new file mode 100644
index 00000000000..2a532133098
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/LY1MerriwthrSans-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{LY1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for LY1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{LY1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TOsF/m/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{sc}{
+ <-> alias * MerriwthrSans-TOsF/l/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{scit}{
+ <-> alias * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{MerriwthrSans-TOsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-LF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-LF.fd
new file mode 100644
index 00000000000..cdc8228b694
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{sc}{
+ <-> alias * Merriwthr-LF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{scit}{
+ <-> alias * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{scsl}{
+ <-> ssub * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{scsl}{
+ <-> ssub * Merriwthr-LF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{sc}{
+ <-> alias * Merriwthr-LF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{scit}{
+ <-> alias * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{scsl}{
+ <-> ssub * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{scsl}{
+ <-> ssub * Merriwthr-LF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{sc}{
+ <-> alias * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{scit}{
+ <-> alias * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{scsl}{
+ <-> ssub * Merriwthr-LF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{sc}{
+ <-> alias * Merriwthr-LF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{scit}{
+ <-> alias * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{scsl}{
+ <-> ssub * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{scsl}{
+ <-> ssub * Merriwthr-LF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{sc}{
+ <-> ssub * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-LF}{bx}{scit}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd
index e6c211f1e7d..3d121952b1c 100644
--- a/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{OT1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for OT1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{OT1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{sc}{
+ <-> alias * Merriwthr-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{it}{
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{it}{
<-> \Merriwthr@@scale Merriwthr-Italic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-sc-ot1
+}{}
-% ---- bold ----
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{scit}{
+ <-> alias * Merriwthr-OsF/m/scit
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{scsl}{
+ <-> ssub * Merriwthr-OsF/m/scit
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-OsF/regular/scit
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{sc}{
+ <-> alias * Merriwthr-OsF/eb/sc
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-ot1
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
+}{}
-% ---- ultrabold ----
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-ot1
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ot1
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{scit}{
+ <-> alias * Merriwthr-OsF/eb/scit
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-OsF/eb/scit
+}{}
-% l --> light
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{scsl}{
+ <-> ssub * Merriwthr-OsF/black/scit
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{OT1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-sc-ot1
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{sc}{
+ <-> alias * Merriwthr-OsF/b/sc
+}{}
-% m --> regular
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-ot1
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-sc-ot1
+}{}
-% b --> bold
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{scit}{
+ <-> alias * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-OsF/bold/scit
+}{}
\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{sc}{
+ <-> alias * Merriwthr-OsF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-ot1
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{scit}{
+ <-> alias * Merriwthr-OsF/l/scit
+}{}
-% ub --> ultrabold
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{scsl}{
+ <-> ssub * Merriwthr-OsF/l/scit
+}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{scsl}{
+ <-> ssub * Merriwthr-OsF/light/scit
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{OT1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{OT1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{OT1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{sc}{
+ <-> ssub * Merriwthr-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scsl
+}{}
+
\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{sl}{
<-> ssub * Merriwthr-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{OT1}{Merriwthr-OsF}{bx}{scit}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-Sup.fd
new file mode 100644
index 00000000000..972a98a2e39
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-Sup.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-Sup.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{regular}{n}{
+ <-> alias * Merriwthr-Sup/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{regular}{it}{
+ <-> alias * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{m}{sl}{
+ <-> ssub * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{regular}{sl}{
+ <-> ssub * Merriwthr-Sup/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{black}{n}{
+ <-> alias * Merriwthr-Sup/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{black}{it}{
+ <-> alias * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{eb}{sl}{
+ <-> ssub * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{black}{sl}{
+ <-> ssub * Merriwthr-Sup/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bold}{n}{
+ <-> alias * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bold}{it}{
+ <-> alias * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{b}{sl}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bold}{sl}{
+ <-> ssub * Merriwthr-Sup/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{light}{n}{
+ <-> alias * Merriwthr-Sup/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{light}{it}{
+ <-> alias * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{l}{sl}{
+ <-> ssub * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{light}{sl}{
+ <-> ssub * Merriwthr-Sup/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bx}{n}{
+ <-> ssub * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bx}{sl}{
+ <-> ssub * Merriwthr-Sup/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-Sup}{bx}{it}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TLF.fd
new file mode 100644
index 00000000000..3cfead0171d
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{sc}{
+ <-> alias * Merriwthr-TLF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{scit}{
+ <-> alias * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{scsl}{
+ <-> ssub * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TLF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{sc}{
+ <-> alias * Merriwthr-TLF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{scit}{
+ <-> alias * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{scsl}{
+ <-> ssub * Merriwthr-TLF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{sc}{
+ <-> alias * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{scit}{
+ <-> alias * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{sc}{
+ <-> alias * Merriwthr-TLF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{scit}{
+ <-> alias * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{scsl}{
+ <-> ssub * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{scsl}{
+ <-> ssub * Merriwthr-TLF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{sc}{
+ <-> ssub * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TLF}{bx}{scit}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TOsF.fd
new file mode 100644
index 00000000000..72b89789b1a
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1Merriwthr-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{sc}{
+ <-> alias * Merriwthr-TOsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{scit}{
+ <-> alias * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{scsl}{
+ <-> ssub * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{sc}{
+ <-> alias * Merriwthr-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{scit}{
+ <-> alias * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{scsl}{
+ <-> ssub * Merriwthr-TOsF/black/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{sc}{
+ <-> alias * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{scit}{
+ <-> alias * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{sc}{
+ <-> alias * Merriwthr-TOsF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{scit}{
+ <-> alias * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{scsl}{
+ <-> ssub * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{scsl}{
+ <-> ssub * Merriwthr-TOsF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{sc}{
+ <-> ssub * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{Merriwthr-TOsF}{bx}{scit}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-LF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-LF.fd
new file mode 100644
index 00000000000..4e2c35eea6e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{sc}{
+ <-> alias * MerriwthrSans-LF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{scit}{
+ <-> alias * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-LF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{sc}{
+ <-> alias * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{scit}{
+ <-> alias * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{sc}{
+ <-> alias * MerriwthrSans-LF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{scit}{
+ <-> alias * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-LF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-LF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-LF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd
index 1464a5e0c73..3fa832c9320 100644
--- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{OT1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for OT1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{OT1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-OsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{it}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ot1
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
+}{}
+
\DeclareFontShape{OT1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- bold ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{n}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{it}{
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-sc-ot1
+}{}
-% ---- light ----
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-OsF/b/scit
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/bold/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-% ---- extrabold ----
+% ---- l = light ----
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{sc}{
+ <-> alias * MerriwthrSans-OsF/l/sc
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ot1
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
+}{}
-% l --> light
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ot1
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{scit}{
+ <-> alias * MerriwthrSans-OsF/l/scit
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/l/scit
+}{}
-% m --> regular
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/light/scit
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-sc-ot1
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-OsF/eb/sc
+}{}
-% b --> bold
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ot1
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-sc-ot1
+}{}
-% eb --> extrabold
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-OsF/eb/scit
+}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/eb/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/scit
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scsl
+}{}
+
\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{sl}{
<-> ssub * MerriwthrSans-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{OT1}{MerriwthrSans-OsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd
index 5542aa6451c..874aa993ac3 100644
--- a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{OT1MerriwthrSans-Sup.fd}
- [2020/07/30 (autoinst) Font definitions for OT1/MerriwthrSans-Sup.]
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{OT1}{MerriwthrSans-Sup}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{n}{
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{n}{
+ <-> alias * MerriwthrSans-Sup/m/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{sl}{
- <-> ssub * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-ot1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{it}{
+ <-> alias * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{sl}{
+ <-> ssub * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{sl}{
- <-> ssub * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{regular}{sl}{
+ <-> ssub * MerriwthrSans-Sup/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{n}{
+ <-> alias * MerriwthrSans-Sup/b/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{sl}{
- <-> ssub * MerriwthrSans-Sup/light/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-ot1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{it}{
+ <-> alias * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ot1
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{sl}{
+ <-> ssub * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-Sup/extrabold/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{sl}{
- <-> alias * MerriwthrSans-Sup/light/sl
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{n}{
- <-> alias * MerriwthrSans-Sup/light/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{n}{
+ <-> alias * MerriwthrSans-Sup/l/n
}{}
\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{it}{
- <-> alias * MerriwthrSans-Sup/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-ot1
}{}
-
-% m --> regular
-
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{sl}{
- <-> alias * MerriwthrSans-Sup/regular/sl
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{it}{
+ <-> alias * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{n}{
- <-> alias * MerriwthrSans-Sup/regular/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{l}{sl}{
+ <-> ssub * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{m}{it}{
- <-> alias * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{light}{sl}{
+ <-> ssub * MerriwthrSans-Sup/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{sl}{
- <-> alias * MerriwthrSans-Sup/bold/sl
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-ot1
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{n}{
- <-> alias * MerriwthrSans-Sup/bold/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{n}{
+ <-> alias * MerriwthrSans-Sup/eb/n
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{b}{it}{
- <-> alias * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-ot1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{it}{
+ <-> alias * MerriwthrSans-Sup/eb/it
+}{}
\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{sl}{
- <-> alias * MerriwthrSans-Sup/extrabold/sl
+ <-> ssub * MerriwthrSans-Sup/eb/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{n}{
- <-> alias * MerriwthrSans-Sup/extrabold/n
+\DeclareFontShape{OT1}{MerriwthrSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/extrabold/it
}{}
-\DeclareFontShape{OT1}{MerriwthrSans-Sup}{eb}{it}{
- <-> alias * MerriwthrSans-Sup/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{OT1}{MerriwthrSans-Sup}{bx}{n}{
<-> ssub * MerriwthrSans-Sup/b/n
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TLF.fd
new file mode 100644
index 00000000000..e0a876352b5
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TLF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{sc}{
+ <-> alias * MerriwthrSans-TLF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{scit}{
+ <-> alias * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TLF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TLF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TOsF.fd
new file mode 100644
index 00000000000..b7bb8bf52a2
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/OT1MerriwthrSans-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{OT1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for OT1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{OT1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TOsF/m/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{sc}{
+ <-> alias * MerriwthrSans-TOsF/l/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{scit}{
+ <-> alias * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{OT1}{MerriwthrSans-TOsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-LF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-LF.fd
new file mode 100644
index 00000000000..f738ee820a8
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{sc}{
+ <-> alias * Merriwthr-LF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{scit}{
+ <-> alias * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{scsl}{
+ <-> ssub * Merriwthr-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{scsl}{
+ <-> ssub * Merriwthr-LF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{sc}{
+ <-> alias * Merriwthr-LF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{scit}{
+ <-> alias * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{scsl}{
+ <-> ssub * Merriwthr-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{scsl}{
+ <-> ssub * Merriwthr-LF/black/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{sc}{
+ <-> alias * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{scit}{
+ <-> alias * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{scsl}{
+ <-> ssub * Merriwthr-LF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{sc}{
+ <-> alias * Merriwthr-LF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{scit}{
+ <-> alias * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{scsl}{
+ <-> ssub * Merriwthr-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{scsl}{
+ <-> ssub * Merriwthr-LF/light/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{sc}{
+ <-> ssub * Merriwthr-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{scsl}{
+ <-> ssub * Merriwthr-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-LF}{bx}{scit}{
+ <-> ssub * Merriwthr-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd
index 14a66d32e11..373f396e34b 100644
--- a/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{T1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for T1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{T1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sc}{
+ <-> alias * Merriwthr-OsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{it}{
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{it}{
<-> \Merriwthr@@scale Merriwthr-Italic-osf-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-sc-t1
+}{}
-% ---- bold ----
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{scit}{
+ <-> alias * Merriwthr-OsF/m/scit
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{scsl}{
+ <-> ssub * Merriwthr-OsF/m/scit
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-OsF/regular/scit
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{T1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{sc}{
+ <-> alias * Merriwthr-OsF/eb/sc
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-t1
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
+}{}
-% ---- ultrabold ----
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-t1
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-t1
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{scit}{
+ <-> alias * Merriwthr-OsF/eb/scit
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-OsF/eb/scit
+}{}
-% l --> light
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{scsl}{
+ <-> ssub * Merriwthr-OsF/black/scit
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{T1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-sc-t1
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sc}{
+ <-> alias * Merriwthr-OsF/b/sc
+}{}
-% m --> regular
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-t1
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-sc-t1
+}{}
-% b --> bold
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{scit}{
+ <-> alias * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{b}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-OsF/bold/scit
+}{}
\DeclareFontShape{T1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sc}{
+ <-> alias * Merriwthr-OsF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-t1
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{scit}{
+ <-> alias * Merriwthr-OsF/l/scit
+}{}
-% ub --> ultrabold
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{scsl}{
+ <-> ssub * Merriwthr-OsF/l/scit
+}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{scsl}{
+ <-> ssub * Merriwthr-OsF/light/scit
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{T1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{T1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{T1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{sc}{
+ <-> ssub * Merriwthr-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-OsF/b/scsl
+}{}
+
\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{sl}{
<-> ssub * Merriwthr-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * Merriwthr-OsF/b/it
}{}
+\DeclareFontShape{T1}{Merriwthr-OsF}{bx}{scit}{
+ <-> ssub * Merriwthr-OsF/b/scit
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-Sup.fd
new file mode 100644
index 00000000000..10455c335bf
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-Sup.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-Sup.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-Sup.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-Sup}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{regular}{n}{
+ <-> alias * Merriwthr-Sup/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{regular}{it}{
+ <-> alias * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{m}{sl}{
+ <-> ssub * Merriwthr-Sup/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{regular}{sl}{
+ <-> ssub * Merriwthr-Sup/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{black}{n}{
+ <-> alias * Merriwthr-Sup/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{black}{it}{
+ <-> alias * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{eb}{sl}{
+ <-> ssub * Merriwthr-Sup/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{black}{sl}{
+ <-> ssub * Merriwthr-Sup/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bold}{n}{
+ <-> alias * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bold}{it}{
+ <-> alias * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{b}{sl}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bold}{sl}{
+ <-> ssub * Merriwthr-Sup/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{light}{n}{
+ <-> alias * Merriwthr-Sup/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-sup-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{light}{it}{
+ <-> alias * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{l}{sl}{
+ <-> ssub * Merriwthr-Sup/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{light}{sl}{
+ <-> ssub * Merriwthr-Sup/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bx}{n}{
+ <-> ssub * Merriwthr-Sup/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bx}{sl}{
+ <-> ssub * Merriwthr-Sup/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-Sup}{bx}{it}{
+ <-> ssub * Merriwthr-Sup/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TLF.fd
new file mode 100644
index 00000000000..74f3eafdc46
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{sc}{
+ <-> alias * Merriwthr-TLF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{scit}{
+ <-> alias * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{scsl}{
+ <-> ssub * Merriwthr-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TLF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{sc}{
+ <-> alias * Merriwthr-TLF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{scit}{
+ <-> alias * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{scsl}{
+ <-> ssub * Merriwthr-TLF/black/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{sc}{
+ <-> alias * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{scit}{
+ <-> alias * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{sc}{
+ <-> alias * Merriwthr-TLF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{scit}{
+ <-> alias * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{scsl}{
+ <-> ssub * Merriwthr-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{scsl}{
+ <-> ssub * Merriwthr-TLF/light/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{sc}{
+ <-> ssub * Merriwthr-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TLF}{bx}{scit}{
+ <-> ssub * Merriwthr-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TOsF.fd
new file mode 100644
index 00000000000..f897ffbd337
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1Merriwthr-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{sc}{
+ <-> alias * Merriwthr-TOsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{scit}{
+ <-> alias * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{scsl}{
+ <-> ssub * Merriwthr-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{scsl}{
+ <-> ssub * Merriwthr-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{sc}{
+ <-> alias * Merriwthr-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{scit}{
+ <-> alias * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{scsl}{
+ <-> ssub * Merriwthr-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{scsl}{
+ <-> ssub * Merriwthr-TOsF/black/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{sc}{
+ <-> alias * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{scit}{
+ <-> alias * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{scsl}{
+ <-> ssub * Merriwthr-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{sc}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{sc}{
+ <-> alias * Merriwthr-TOsF/l/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{scit}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{scit}{
+ <-> alias * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{scsl}{
+ <-> ssub * Merriwthr-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{scsl}{
+ <-> ssub * Merriwthr-TOsF/light/scit
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{sc}{
+ <-> ssub * Merriwthr-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{scsl}{
+ <-> ssub * Merriwthr-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{Merriwthr-TOsF}{bx}{scit}{
+ <-> ssub * Merriwthr-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-LF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-LF.fd
new file mode 100644
index 00000000000..5f00d3e90ca
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-LF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{sc}{
+ <-> alias * MerriwthrSans-LF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{scit}{
+ <-> alias * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-LF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-LF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{sc}{
+ <-> alias * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{scit}{
+ <-> alias * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{sc}{
+ <-> alias * MerriwthrSans-LF/l/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{scit}{
+ <-> alias * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-LF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-LF/light/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-LF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-LF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-LF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-LF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-LF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-LF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd
index d8bc181b249..9684ec170d1 100644
--- a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{T1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for T1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,132 +20,224 @@
\DeclareFontFamily{T1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-OsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{it}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-t1
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
+}{}
+
\DeclareFontShape{T1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- bold ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{n}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{it}{
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{it}{
<-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-sc-t1
+}{}
-% ---- light ----
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-OsF/b/scit
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/bold/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-% ---- extrabold ----
+% ---- l = light ----
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-sc-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-t1
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{sc}{
+ <-> alias * MerriwthrSans-OsF/l/sc
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-t1
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
+}{}
-% l --> light
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-t1
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-sc-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{scit}{
+ <-> alias * MerriwthrSans-OsF/l/scit
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/l/scit
+}{}
-% m --> regular
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/light/scit
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-sc-t1
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-OsF/eb/sc
+}{}
-% b --> bold
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-t1
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-sc-t1
+}{}
-% eb --> extrabold
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-OsF/eb/scit
+}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/eb/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/scit
}{}
-\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-OsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-OsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-OsF/b/scsl
+}{}
+
\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{sl}{
<-> ssub * MerriwthrSans-OsF/b/sl
}{}
@@ -154,4 +246,8 @@
<-> ssub * MerriwthrSans-OsF/b/it
}{}
+\DeclareFontShape{T1}{MerriwthrSans-OsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-OsF/b/scit
+}{}
+
\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd
index 10c24943910..49c729e09b9 100644
--- a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-Sup.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{T1MerriwthrSans-Sup.fd}
- [2020/07/30 (autoinst) Font definitions for T1/MerriwthrSans-Sup.]
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-Sup.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{T1}{MerriwthrSans-Sup}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{n}{
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{n}{
+ <-> alias * MerriwthrSans-Sup/m/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{sl}{
- <-> ssub * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-sup-t1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{it}{
+ <-> alias * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{sl}{
+ <-> ssub * MerriwthrSans-Sup/m/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{sl}{
- <-> ssub * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{regular}{sl}{
+ <-> ssub * MerriwthrSans-Sup/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{n}{
+ <-> alias * MerriwthrSans-Sup/b/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{sl}{
- <-> ssub * MerriwthrSans-Sup/light/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-sup-t1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{it}{
+ <-> alias * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-t1
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{sl}{
+ <-> ssub * MerriwthrSans-Sup/b/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-Sup/extrabold/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{bold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{sl}{
- <-> alias * MerriwthrSans-Sup/light/sl
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{n}{
- <-> alias * MerriwthrSans-Sup/light/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{n}{
+ <-> alias * MerriwthrSans-Sup/l/n
}{}
\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{it}{
- <-> alias * MerriwthrSans-Sup/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-sup-t1
}{}
-
-% m --> regular
-
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{sl}{
- <-> alias * MerriwthrSans-Sup/regular/sl
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{it}{
+ <-> alias * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{n}{
- <-> alias * MerriwthrSans-Sup/regular/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{l}{sl}{
+ <-> ssub * MerriwthrSans-Sup/l/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{m}{it}{
- <-> alias * MerriwthrSans-Sup/regular/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{light}{sl}{
+ <-> ssub * MerriwthrSans-Sup/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{sl}{
- <-> alias * MerriwthrSans-Sup/bold/sl
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-sup-t1
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{n}{
- <-> alias * MerriwthrSans-Sup/bold/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{n}{
+ <-> alias * MerriwthrSans-Sup/eb/n
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{b}{it}{
- <-> alias * MerriwthrSans-Sup/bold/it
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-sup-t1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{it}{
+ <-> alias * MerriwthrSans-Sup/eb/it
+}{}
\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{sl}{
- <-> alias * MerriwthrSans-Sup/extrabold/sl
+ <-> ssub * MerriwthrSans-Sup/eb/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{n}{
- <-> alias * MerriwthrSans-Sup/extrabold/n
+\DeclareFontShape{T1}{MerriwthrSans-Sup}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-Sup/extrabold/it
}{}
-\DeclareFontShape{T1}{MerriwthrSans-Sup}{eb}{it}{
- <-> alias * MerriwthrSans-Sup/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{T1}{MerriwthrSans-Sup}{bx}{n}{
<-> ssub * MerriwthrSans-Sup/b/n
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TLF.fd
new file mode 100644
index 00000000000..62c9f2776cb
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TLF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TLF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{sc}{
+ <-> alias * MerriwthrSans-TLF/l/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{scit}{
+ <-> alias * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/light/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TLF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TLF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TLF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TLF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TLF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TOsF.fd
new file mode 100644
index 00000000000..36d3c233567
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/T1MerriwthrSans-TOsF.fd
@@ -0,0 +1,253 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{T1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for T1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{T1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{sc}{
+ <-> alias * MerriwthrSans-TOsF/m/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{scit}{
+ <-> alias * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/m/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{sc}{
+ <-> alias * MerriwthrSans-TOsF/l/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{scit}{
+ <-> alias * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/l/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/light/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{sc}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{sc}{
+ <-> alias * MerriwthrSans-TOsF/eb/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{scit}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{scit}{
+ <-> alias * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/scit
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{sc}{
+ <-> ssub * MerriwthrSans-TOsF/b/sc
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{scsl}{
+ <-> ssub * MerriwthrSans-TOsF/b/scsl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{T1}{MerriwthrSans-TOsF}{bx}{scit}{
+ <-> ssub * MerriwthrSans-TOsF/b/scit
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-LF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-LF.fd
new file mode 100644
index 00000000000..1c0a10949ab
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-LF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1Merriwthr-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Merriwthr-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{regular}{n}{
+ <-> alias * Merriwthr-LF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{regular}{it}{
+ <-> alias * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{m}{sl}{
+ <-> ssub * Merriwthr-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{regular}{sl}{
+ <-> ssub * Merriwthr-LF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{black}{n}{
+ <-> alias * Merriwthr-LF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{black}{it}{
+ <-> alias * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{eb}{sl}{
+ <-> ssub * Merriwthr-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{black}{sl}{
+ <-> ssub * Merriwthr-LF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bold}{n}{
+ <-> alias * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bold}{it}{
+ <-> alias * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{b}{sl}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bold}{sl}{
+ <-> ssub * Merriwthr-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{light}{n}{
+ <-> alias * Merriwthr-LF/l/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{light}{it}{
+ <-> alias * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{l}{sl}{
+ <-> ssub * Merriwthr-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{light}{sl}{
+ <-> ssub * Merriwthr-LF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bx}{n}{
+ <-> ssub * Merriwthr-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bx}{sl}{
+ <-> ssub * Merriwthr-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-LF}{bx}{it}{
+ <-> ssub * Merriwthr-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd
index cdb6daa679e..37f570c74ba 100644
--- a/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{TS1Merriwthr-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for TS1/Merriwthr-OsF.]
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,128 +20,116 @@
\DeclareFontFamily{TS1}{Merriwthr-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{n}{
+\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{n}{
<-> \Merriwthr@@scale Merriwthr-Regular-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{it}{
- <-> \Merriwthr@@scale Merriwthr-Italic-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{n}{
+ <-> alias * Merriwthr-OsF/m/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{sl}{
- <-> ssub * Merriwthr-OsF/regular/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-osf-ts1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{n}{
- <-> \Merriwthr@@scale Merriwthr-Bold-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{it}{
+ <-> alias * Merriwthr-OsF/m/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{it}{
- <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{sl}{
+ <-> ssub * Merriwthr-OsF/m/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{sl}{
- <-> ssub * Merriwthr-OsF/bold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{regular}{sl}{
+ <-> ssub * Merriwthr-OsF/regular/it
}{}
-% ---- light ----
+% ---- eb = black ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{n}{
- <-> \Merriwthr@@scale Merriwthr-Light-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{it}{
- <-> \Merriwthr@@scale Merriwthr-LightIt-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{black}{n}{
+ <-> alias * Merriwthr-OsF/eb/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{sl}{
- <-> ssub * Merriwthr-OsF/light/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-osf-ts1
}{}
-
-% ---- ultrabold ----
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{n}{
- <-> \Merriwthr@@scale Merriwthr-UltraBold-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{black}{it}{
+ <-> alias * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{it}{
- <-> \Merriwthr@@scale Merriwthr-UltraBdIt-osf-ts1
+\DeclareFontShape{TS1}{Merriwthr-OsF}{eb}{sl}{
+ <-> ssub * Merriwthr-OsF/eb/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ultrabold}{sl}{
- <-> ssub * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{black}{sl}{
+ <-> ssub * Merriwthr-OsF/black/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- b = bold ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{sl}{
- <-> alias * Merriwthr-OsF/light/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{n}{
- <-> alias * Merriwthr-OsF/light/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{n}{
+ <-> alias * Merriwthr-OsF/b/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{it}{
- <-> alias * Merriwthr-OsF/light/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-osf-ts1
}{}
-
-% m --> regular
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{sl}{
- <-> alias * Merriwthr-OsF/regular/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{it}{
+ <-> alias * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{n}{
- <-> alias * Merriwthr-OsF/regular/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{sl}{
+ <-> ssub * Merriwthr-OsF/b/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{m}{it}{
- <-> alias * Merriwthr-OsF/regular/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{bold}{sl}{
+ <-> ssub * Merriwthr-OsF/bold/it
}{}
-% b --> bold
+% ---- l = light ----
-\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{sl}{
- <-> alias * Merriwthr-OsF/bold/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{n}{
- <-> alias * Merriwthr-OsF/bold/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{n}{
+ <-> alias * Merriwthr-OsF/l/n
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{b}{it}{
- <-> alias * Merriwthr-OsF/bold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-osf-ts1
}{}
-
-% ub --> ultrabold
-
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{sl}{
- <-> alias * Merriwthr-OsF/ultrabold/sl
+\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{it}{
+ <-> alias * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{n}{
- <-> alias * Merriwthr-OsF/ultrabold/n
+\DeclareFontShape{TS1}{Merriwthr-OsF}{l}{sl}{
+ <-> ssub * Merriwthr-OsF/l/it
}{}
-\DeclareFontShape{TS1}{Merriwthr-OsF}{ub}{it}{
- <-> alias * Merriwthr-OsF/ultrabold/it
+\DeclareFontShape{TS1}{Merriwthr-OsF}{light}{sl}{
+ <-> ssub * Merriwthr-OsF/light/it
}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
\DeclareFontShape{TS1}{Merriwthr-OsF}{bx}{n}{
<-> ssub * Merriwthr-OsF/b/n
}{}
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TLF.fd
new file mode 100644
index 00000000000..7503c534480
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TLF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1Merriwthr-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Merriwthr-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{regular}{n}{
+ <-> alias * Merriwthr-TLF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{regular}{it}{
+ <-> alias * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{m}{sl}{
+ <-> ssub * Merriwthr-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{regular}{sl}{
+ <-> ssub * Merriwthr-TLF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{black}{n}{
+ <-> alias * Merriwthr-TLF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{black}{it}{
+ <-> alias * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{eb}{sl}{
+ <-> ssub * Merriwthr-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{black}{sl}{
+ <-> ssub * Merriwthr-TLF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bold}{n}{
+ <-> alias * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bold}{it}{
+ <-> alias * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{b}{sl}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bold}{sl}{
+ <-> ssub * Merriwthr-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{light}{n}{
+ <-> alias * Merriwthr-TLF/l/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{light}{it}{
+ <-> alias * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{l}{sl}{
+ <-> ssub * Merriwthr-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{light}{sl}{
+ <-> ssub * Merriwthr-TLF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bx}{n}{
+ <-> ssub * Merriwthr-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bx}{sl}{
+ <-> ssub * Merriwthr-TLF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TLF}{bx}{it}{
+ <-> ssub * Merriwthr-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TOsF.fd
new file mode 100644
index 00000000000..0bfd1d2b2d9
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriwthr-TOsF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1Merriwthr-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/Merriwthr-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname Merriwthr@scale\endcsname\relax
+ \let\Merriwthr@@scale\@empty
+\else
+ \edef\Merriwthr@@scale{s*[\csname Merriwthr@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{Merriwthr-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{m}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{regular}{n}{
+ <-> alias * Merriwthr-TOsF/m/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{m}{it}{
+ <-> \Merriwthr@@scale Merriwthr-Italic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{regular}{it}{
+ <-> alias * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{m}{sl}{
+ <-> ssub * Merriwthr-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{regular}{sl}{
+ <-> ssub * Merriwthr-TOsF/regular/it
+}{}
+
+
+% ---- eb = black ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{eb}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Black-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{black}{n}{
+ <-> alias * Merriwthr-TOsF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{eb}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BlackItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{black}{it}{
+ <-> alias * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{eb}{sl}{
+ <-> ssub * Merriwthr-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{black}{sl}{
+ <-> ssub * Merriwthr-TOsF/black/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{b}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bold}{n}{
+ <-> alias * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{b}{it}{
+ <-> \Merriwthr@@scale Merriwthr-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bold}{it}{
+ <-> alias * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{b}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bold}{sl}{
+ <-> ssub * Merriwthr-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{l}{n}{
+ <-> \Merriwthr@@scale Merriwthr-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{light}{n}{
+ <-> alias * Merriwthr-TOsF/l/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{l}{it}{
+ <-> \Merriwthr@@scale Merriwthr-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{light}{it}{
+ <-> alias * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{l}{sl}{
+ <-> ssub * Merriwthr-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{light}{sl}{
+ <-> ssub * Merriwthr-TOsF/light/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bx}{n}{
+ <-> ssub * Merriwthr-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bx}{sl}{
+ <-> ssub * Merriwthr-TOsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{Merriwthr-TOsF}{bx}{it}{
+ <-> ssub * Merriwthr-TOsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-LF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-LF.fd
new file mode 100644
index 00000000000..db8f23f6b5f
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-LF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1MerriwthrSans-LF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-LF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MerriwthrSans-LF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{regular}{n}{
+ <-> alias * MerriwthrSans-LF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{regular}{it}{
+ <-> alias * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{m}{sl}{
+ <-> ssub * MerriwthrSans-LF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-LF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bold}{n}{
+ <-> alias * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bold}{it}{
+ <-> alias * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{b}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-LF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{light}{n}{
+ <-> alias * MerriwthrSans-LF/l/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{light}{it}{
+ <-> alias * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{l}{sl}{
+ <-> ssub * MerriwthrSans-LF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{light}{sl}{
+ <-> ssub * MerriwthrSans-LF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-LF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-LF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-LF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bx}{n}{
+ <-> ssub * MerriwthrSans-LF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-LF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-LF}{bx}{it}{
+ <-> ssub * MerriwthrSans-LF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd
index e347fa5662d..33ec62fe335 100644
--- a/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2020/07/30
+%% Generated by autoinst on 2020/08/30
%%
\ProvidesFile{TS1MerriwthrSans-OsF.fd}
- [2020/07/30 (autoinst) Font definitions for TS1/MerriwthrSans-OsF.]
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-OsF.]
\ifcsname s@fct@alias\endcsname\else
\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
@@ -20,127 +20,115 @@
\DeclareFontFamily{TS1}{MerriwthrSans-OsF}{}
-% ---- regular ----
+% ---- m = regular ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{n}{
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{n}{
<-> \MerriwthrSans@@scale MerriwthrSans-Regular-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{n}{
+ <-> alias * MerriwthrSans-OsF/m/n
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{sl}{
- <-> ssub * MerriwthrSans-OsF/regular/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-osf-ts1
}{}
-
-% ---- bold ----
-
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{it}{
+ <-> alias * MerriwthrSans-OsF/m/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-OsF/m/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{sl}{
- <-> ssub * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-OsF/regular/it
}{}
-% ---- light ----
+% ---- b = bold ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{n}{
+ <-> alias * MerriwthrSans-OsF/b/n
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{sl}{
- <-> ssub * MerriwthrSans-OsF/light/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-osf-ts1
}{}
-
-% ---- extrabold ----
-
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{n}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{it}{
+ <-> alias * MerriwthrSans-OsF/b/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{it}{
- <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ts1
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-OsF/b/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{sl}{
- <-> ssub * MerriwthrSans-OsF/extrabold/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/bold/it
}{}
-%
-% Extra 'alias' rules to map the standard NFSS codes to our fancy names
-%
-% l --> light
+% ---- l = light ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{sl}{
- <-> alias * MerriwthrSans-OsF/light/sl
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{n}{
- <-> alias * MerriwthrSans-OsF/light/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{n}{
+ <-> alias * MerriwthrSans-OsF/l/n
}{}
\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{it}{
- <-> alias * MerriwthrSans-OsF/light/it
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-osf-ts1
}{}
-
-% m --> regular
-
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{sl}{
- <-> alias * MerriwthrSans-OsF/regular/sl
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{it}{
+ <-> alias * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{n}{
- <-> alias * MerriwthrSans-OsF/regular/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-OsF/l/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{m}{it}{
- <-> alias * MerriwthrSans-OsF/regular/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-OsF/light/it
}{}
-% b --> bold
+% ---- eb = extrabold ----
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{sl}{
- <-> alias * MerriwthrSans-OsF/bold/sl
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-osf-ts1
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{n}{
- <-> alias * MerriwthrSans-OsF/bold/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-OsF/eb/n
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{b}{it}{
- <-> alias * MerriwthrSans-OsF/bold/it
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-osf-ts1
}{}
-
-% eb --> extrabold
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-OsF/eb/it
+}{}
\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{sl}{
- <-> alias * MerriwthrSans-OsF/extrabold/sl
+ <-> ssub * MerriwthrSans-OsF/eb/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{n}{
- <-> alias * MerriwthrSans-OsF/extrabold/n
+\DeclareFontShape{TS1}{MerriwthrSans-OsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-OsF/extrabold/it
}{}
-\DeclareFontShape{TS1}{MerriwthrSans-OsF}{eb}{it}{
- <-> alias * MerriwthrSans-OsF/extrabold/it
-}{}
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
\DeclareFontShape{TS1}{MerriwthrSans-OsF}{bx}{n}{
<-> ssub * MerriwthrSans-OsF/b/n
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TLF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TLF.fd
new file mode 100644
index 00000000000..08dcb35871e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TLF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1MerriwthrSans-TLF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-TLF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MerriwthrSans-TLF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{regular}{n}{
+ <-> alias * MerriwthrSans-TLF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{regular}{it}{
+ <-> alias * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TLF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TLF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bold}{n}{
+ <-> alias * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bold}{it}{
+ <-> alias * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{light}{n}{
+ <-> alias * MerriwthrSans-TLF/l/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{light}{it}{
+ <-> alias * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TLF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TLF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TLF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TLF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TLF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TLF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TLF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TLF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TLF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TOsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TOsF.fd
new file mode 100644
index 00000000000..f52dcac8b95
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1MerriwthrSans-TOsF.fd
@@ -0,0 +1,145 @@
+%% Generated by autoinst on 2020/08/30
+%%
+\ProvidesFile{TS1MerriwthrSans-TOsF.fd}
+ [2020/08/30 (autoinst) Font definitions for TS1/MerriwthrSans-TOsF.]
+
+\ifcsname s@fct@alias\endcsname\else
+\gdef\s@fct@alias{\sub@sfcnt\@font@aliasinfo}
+\gdef\@font@aliasinfo#1{%
+ \@font@info{Font\space shape\space `\curr@fontshape'\space will
+ \space be\space aliased\MessageBreak to\space `\mandatory@arg'}%
+}
+\fi
+
+\expandafter\ifx\csname MerriwthrSans@scale\endcsname\relax
+ \let\MerriwthrSans@@scale\@empty
+\else
+ \edef\MerriwthrSans@@scale{s*[\csname MerriwthrSans@scale\endcsname]}%
+\fi
+
+\DeclareFontFamily{TS1}{MerriwthrSans-TOsF}{}
+
+
+% ---- m = regular ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{m}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{regular}{n}{
+ <-> alias * MerriwthrSans-TOsF/m/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{m}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Italic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{regular}{it}{
+ <-> alias * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{m}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/m/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{regular}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/regular/it
+}{}
+
+
+% ---- b = bold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{b}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Bold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bold}{n}{
+ <-> alias * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{b}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-BoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bold}{it}{
+ <-> alias * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{b}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/bold/it
+}{}
+
+
+% ---- l = light ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{l}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{light}{n}{
+ <-> alias * MerriwthrSans-TOsF/l/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{l}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-LightItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{light}{it}{
+ <-> alias * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{l}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/l/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{light}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/light/it
+}{}
+
+
+% ---- eb = extrabold ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{eb}{n}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{extrabold}{n}{
+ <-> alias * MerriwthrSans-TOsF/eb/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{eb}{it}{
+ <-> \MerriwthrSans@@scale MerriwthrSans-ExtraBoldItalic-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{extrabold}{it}{
+ <-> alias * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{eb}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/eb/it
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{extrabold}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/extrabold/it
+}{}
+
+
+% ---- Extra 'ssub' rules to map 'bx' to 'b' ----
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bx}{n}{
+ <-> ssub * MerriwthrSans-TOsF/b/n
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bx}{sl}{
+ <-> ssub * MerriwthrSans-TOsF/b/sl
+}{}
+
+\DeclareFontShape{TS1}{MerriwthrSans-TOsF}{bx}{it}{
+ <-> ssub * MerriwthrSans-TOsF/b/it
+}{}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
index 35fba36110f..71fd75b8202 100644
--- a/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
+++ b/Master/texmf-dist/tex/latex/merriweather/merriweather.sty
@@ -1,15 +1,15 @@
\ProvidesPackage{merriweather}[%
- 2020/07/31 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
+ 2020/08/30 (Bob Tennent) Supports Merriweather(Sans) fonts for all LaTeX engines. ]
\RequirePackage{ifxetex,ifluatex,textcomp}
-\newif\ifmerriweather@ttf
+\newif\ifmerriweather@otf
\ifxetex
- \merriweather@ttftrue
+ \merriweather@otftrue
\else\ifluatex
- \merriweather@ttftrue
+ \merriweather@otftrue
\else % [pdf]LaTeX
- \merriweather@ttffalse
+ \merriweather@otffalse
\fi\fi
\newcommand*{\Merriwthr@scale}{1} % not adjustable
@@ -25,94 +25,208 @@
\newif\ifmerriweather@sflight \merriweather@sflightfalse
\newif\ifmerriweather@rmblack \merriweather@rmblackfalse
\newif\ifmerriweather@sfblack \merriweather@sfblackfalse
+\newif\ifmerriweather@rmlining \merriweather@rmliningfalse
+\newif\ifmerriweather@rmtabular \merriweather@rmtabularfalse
+\newif\ifmerriweather@sflining \merriweather@sfliningfalse
+\newif\ifmerriweather@sftabular \merriweather@sftabularfalse
+
\DeclareOptionX{sf}{\merriweather@sftrue}
\DeclareOptionX{rm}{\merriweather@rmtrue}
\DeclareOptionX{sfdefault}{\merriweather@sftrue\merriweather@sfdefaulttrue}
-\DeclareOptionX{type1}{\merriweather@ttffalse}
+\DeclareOptionX{type1}{\merriweather@otffalse}
\DeclareOptionX{light}{\merriweather@rmlighttrue\merriweather@sflighttrue}
\DeclareOptionX{rmlight}{\merriweather@rmlighttrue}
\DeclareOptionX{sflight}{\merriweather@sflighttrue}
\DeclareOptionX{black}{\merriweather@rmblacktrue\merriweather@sfblacktrue}
\DeclareOptionX{rmblack}{\merriweather@rmblacktrue}
\DeclareOptionX{sfblack}{\merriweather@sfblacktrue}
+\DeclareOptionX{rmlining}{\merriweather@rmliningtrue}
+\DeclareOptionX{rmoldstyle}{\merriweather@rmliningfalse}
+\DeclareOptionX{sflining}{\merriweather@sfliningtrue}
+\DeclareOptionX{sfoldstyle}{\merriweather@sfliningfalse}
+\DeclareOptionX{rmtabular}{\merriweather@rmtabulartrue}
+\DeclareOptionX{rmproportional}{\merriweather@rmtabularfalse}
+\DeclareOptionX{sftabular}{\merriweather@sftabulartrue}
+\DeclareOptionX{sfproportional}{\merriweather@sftabularfalse}
+
\ProcessOptionsX\relax
-\ifmerriweather@ttf
+\ifmerriweather@otf
\RequirePackage{fontspec}
\else
- \RequirePackage{fontenc,fontaxes,mweights}
+ \RequirePackage{fontenc,fontaxes}
\fi
\ifmerriweather@rm\else\ifmerriweather@sf\else
\merriweather@rmtrue\merriweather@sftrue % both false -> both true
\fi\fi
+\ifmerriweather@otf
+ \ifmerriweather@rmlining
+ \def\merriweather@figurestyle{Lining}
+ \else
+ \def\merriweather@figurestyle{OldStyle}
+ \fi
+ \ifmerriweather@rmtabular
+ \def\merriweather@figurealign{Monospaced}
+ \else
+ \def\merriweather@figurealign{Proportional}
+ \fi
+
+ \ifmerriweather@sflining
+ \def\merriweathersans@figurestyle{Lining}
+ \else
+ \def\merriweathersans@figurestyle{OldStyle}
+ \fi
+ \ifmerriweather@sftabular
+ \def\merriweathersans@figurealign{Monospaced}
+ \else
+ \def\merriweathersans@figurealign{Proportional}
+ \fi
+
+ \ifmerriweather@rmlight
+ \def\merriweather@regularstyle{Light}
+ \else
+ \def\merriweather@regularstyle{Regular}
+ \fi
+ \ifmerriweather@rmblack
+ \def\merriweather@boldstyle{Black}
+ \else
+ \def\merriweather@boldstyle{Bold}
+ \fi
+
+ \ifmerriweather@sflight
+ \def\merriweathersans@regularstyle{Light}
+ \else
+ \def\merriweathersans@regularstyle{Regular}
+ \fi
+ \ifmerriweather@sfblack
+ \def\merriweathersans@boldstyle{ExtraBold}
+ \else
+ \def\merriweathersans@boldstyle{Bold}
+ \fi
+
+\else % type1
+ \ifmerriweather@rmlining
+ \def\merriweather@figurestyle{LF}
+ \else
+ \def\merriweather@figurestyle{OsF}
+ \fi
+ \ifmerriweather@rmtabular
+ \def\merriweather@figurealign{T}
+ \else
+ \def\merriweather@figurealign{}
+ \fi
+ \ifmerriweather@sflining
+ \def\merriweathersans@figurestyle{LF}
+ \else
+ \def\merriweathersans@figurestyle{OsF}
+ \fi
+ \ifmerriweather@sftabular
+ \def\merriweathersans@figurealign{T}
+ \else
+ \def\merriweathersans@figurealign{}
+ \fi
+
+ \ifmerriweather@rmlight
+ \def\mdseries@rm{light}
+ \else
+ \def\mdseries@rm{m}
+ \fi
+ \def\seriesdefault{\mdseries@rm}
+ \ifmerriweather@rmblack
+ \def\bfseries@rm{black}
+ \else
+ \def\bfseries@rm{b}
+ \fi
+
+ \ifmerriweather@sflight
+ \def\mdseries@sf{light}
+ \else
+ \def\mdseries@sf{m}
+ \fi
+ \def\seriesdefault{\mdseries@sf}
+ \ifmerriweather@sfblack
+ \def\bfseries@sf{black}
+ \else
+ \def\bfseries@sf{b}
+ \fi
+
+\fi
+
% Set main and/or sans fonts:
-\ifmerriweather@ttf
+\ifmerriweather@otf
\ifxetex\XeTeXtracingfonts=1\fi
\defaultfontfeatures{
Ligatures = TeX ,
- Extension = .ttf ,
+ Extension = .otf ,
}
\ifmerriweather@rm
\ifmerriweather@rmlight
\ifmerriweather@rmblack
\setmainfont
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\else
\setmainfont
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
+ BoldItalicFont = *-BoldItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
{Merriweather}
\fi
\else
\ifmerriweather@rmblack
\setmainfont
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\else
\setmainfont
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
+ BoldItalicFont = *-BoldItalic ]
{Merriweather}
\newfontfamily\merriweather
- [ UprightFont = *-Regular ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
- BoldItalicFont = *-BoldIt ]
+ BoldItalicFont = *-BoldItalic ]
{Merriweather}
\fi
\fi
@@ -121,29 +235,33 @@
\ifmerriweather@sflight
\ifmerriweather@sfblack
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\else
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-Bold ,
@@ -153,29 +271,33 @@
\else
\ifmerriweather@sfblack
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{MerriweatherSans}
\else
\setsansfont
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
BoldItalicFont = *-BoldItalic ]
{MerriweatherSans}
\newfontfamily\merriweathersans
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Regular ,
ItalicFont = *-Italic ,
BoldFont = *-Bold ,
@@ -190,37 +312,41 @@
\renewcommand*\familydefault{\merriweathersffamily}
\fi
\newfontfamily\merriweatherlight
- [ UprightFont = *-Light ,
- ItalicFont = *-LightIt ,
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Light ,
+ ItalicFont = *-LightItalic ,
BoldFont = *-Light ,
- BoldItalicFont = *-LightIt ]
+ BoldItalicFont = *-LightItalic ]
{Merriweather}
\newfontfamily\merriweathersanslight
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-Light ,
ItalicFont = *-LightItalic ,
BoldFont = *-Light ,
BoldItalicFont = *-LightItalic ]
{MerriweatherSans}
\newfontfamily\merriweatherblack
- [ UprightFont = *-UltraBold ,
- ItalicFont = *-UltraBdIt ,
- BoldFont = *-UltraBold ,
- BoldItalicFont = *-UltraBdIt ]
+ [ Numbers = {\merriweather@figurealign,\merriweather@figurestyle},
+ UprightFont = *-Black ,
+ ItalicFont = *-BlackItalic ,
+ BoldFont = *-Black ,
+ BoldItalicFont = *-BlackItalic ]
{Merriweather}
\newfontfamily\merriweathersansblack
- [ Scale = \MerriwthrSans@scale ,
+ [ Numbers = {\merriweathersans@figurealign,\merriweathersans@figurestyle},
+ Scale = \MerriwthrSans@scale ,
UprightFont = *-ExtraBold ,
- ItalicFont = *-ExBoldIt ,
+ ItalicFont = *-ExtraBoldItalic ,
BoldFont = *-ExtraBold ,
- BoldItalicFont = *-ExBoldIt ]
+ BoldItalicFont = *-ExtraBoldItalic ]
{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
+ \ifmerriweather@rmblack\def\bfseries@rm{eb}\else\def\bfseries@rm{b}\fi
\else
\def\mdseries@rm{m}\def\bfseries@rm{b}
\fi
@@ -233,8 +359,8 @@
- \def\merriweatherfamily{Merriwthr-OsF}
- \def\merriweathersffamily{MerriwthrSans-OsF}
+ \def\merriweatherfamily{Merriwthr-\merriweather@figurealign\merriweather@figurestyle}
+ \def\merriweathersffamily{MerriwthrSans-\merriweathersans@figurealign\merriweathersans@figurestyle}
\ifmerriweather@rm
\renewcommand*\rmdefault{\merriweatherfamily}
@@ -254,13 +380,14 @@
\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*\merriweatherblack{\fontfamily{\merriweatherfamily}\fontseries{eb}\selectfont}
\newcommand*\merriweathersansblack{\fontfamily{\merriweathersffamily}\fontseries{eb}\selectfont}
+
\fi
% turn off defaults in case other fonts are selected:
-\ifmerriweather@ttf
+\ifmerriweather@otf
\defaultfontfeatures{}
\fi