summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd')
-rw-r--r--Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd119
1 files changed, 97 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
index 75dd3b220ce..7f86bea703f 100644
--- a/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
+++ b/Master/texmf-dist/tex/latex/merriweather/TS1Merriweather-OsF.fd
@@ -1,7 +1,7 @@
-%% Generated by autoinst on 2014/01/22
+%% Generated by autoinst on 2019/06/02
%%
\ProvidesFile{TS1Merriweather-OsF.fd}
- [2014/01/22 (autoinst) Font definitions for TS1/Merriweather-OsF.]
+ [2019/06/02 (autoinst) Font definitions for TS1/Merriweather-OsF.]
\expandafter\ifx\csname Merriweather@scale\endcsname\relax
\let\Merriweather@@scale\@empty
@@ -11,62 +11,137 @@
\DeclareFontFamily{TS1}{Merriweather-OsF}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{n}{
+ <-> \Merriweather@@scale Merriweather-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{it}{
+ <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{regular}{sl}{
+ <-> ssub * Merriweather-OsF/regular/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{n}{
+ <-> \Merriweather@@scale Merriweather-Bold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{it}{
+ <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{bold}{sl}{
+ <-> ssub * Merriweather-OsF/bold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{light}{n}{
<-> \Merriweather@@scale Merriweather-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
+\DeclareFontShape{TS1}{Merriweather-OsF}{light}{it}{
<-> \Merriweather@@scale Merriweather-LightIt-osf-ts1
}{}
+\DeclareFontShape{TS1}{Merriweather-OsF}{light}{sl}{
+ <-> ssub * Merriweather-OsF/light/it
+}{}
+
+
+% ---- ultrabold ----
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{n}{
+ <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{it}{
+ <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ultrabold}{sl}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
+}{}
+
+%
+% Extra 'ssub' rules to map the standard NFSS codes to our fancy names
+%
+
+% l --> light
+
\DeclareFontShape{TS1}{Merriweather-OsF}{l}{sl}{
- <-> ssub * Merriweather-OsF/l/it
+ <-> ssub * Merriweather-OsF/light/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
- <-> \Merriweather@@scale Merriweather-Bold-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{n}{
+ <-> ssub * Merriweather-OsF/light/n
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
- <-> \Merriweather@@scale Merriweather-BoldItalic-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{l}{it}{
+ <-> ssub * Merriweather-OsF/light/it
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
- <-> ssub * Merriweather-OsF/b/it
+
+% m --> regular
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
+ <-> ssub * Merriweather-OsF/regular/sl
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{m}{n}{
- <-> \Merriweather@@scale Merriweather-Regular-osf-ts1
+ <-> ssub * Merriweather-OsF/regular/n
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{m}{it}{
- <-> \Merriweather@@scale Merriweather-Italic-osf-ts1
+ <-> ssub * Merriweather-OsF/regular/it
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{m}{sl}{
- <-> ssub * Merriweather-OsF/m/it
+
+% b --> bold
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{sl}{
+ <-> ssub * Merriweather-OsF/bold/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{
- <-> \Merriweather@@scale Merriweather-UltraBold-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{n}{
+ <-> ssub * Merriweather-OsF/bold/n
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{
- <-> \Merriweather@@scale Merriweather-UltraBdIt-osf-ts1
+\DeclareFontShape{TS1}{Merriweather-OsF}{b}{it}{
+ <-> ssub * Merriweather-OsF/bold/it
}{}
+
+% ub --> ultrabold
+
\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{sl}{
- <-> ssub * Merriweather-OsF/ub/it
+ <-> ssub * Merriweather-OsF/ultrabold/sl
}{}
-\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
- <-> ssub * Merriweather-OsF/b/sl
+\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{n}{
+ <-> ssub * Merriweather-OsF/ultrabold/n
+}{}
+
+\DeclareFontShape{TS1}{Merriweather-OsF}{ub}{it}{
+ <-> ssub * Merriweather-OsF/ultrabold/it
}{}
\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{n}{
<-> ssub * Merriweather-OsF/b/n
}{}
+\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{sl}{
+ <-> ssub * Merriweather-OsF/b/sl
+}{}
+
\DeclareFontShape{TS1}{Merriweather-OsF}{bx}{it}{
<-> ssub * Merriweather-OsF/b/it
}{}