summaryrefslogtreecommitdiff
path: root/fonts/sourcesanspro/tex
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2020-04-27 03:03:41 +0000
committerNorbert Preining <norbert@preining.info>2020-04-27 03:03:41 +0000
commitae496a1c963576dfe63885afa818b2af745ed44a (patch)
tree62604706ca603c17f5f56fe646072d8d2cfab60c /fonts/sourcesanspro/tex
parent7d9d2e08fcab92adcc759e3f1e4bb0a15a63f220 (diff)
CTAN sync 202004270303
Diffstat (limited to 'fonts/sourcesanspro/tex')
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-Dnom.fd183
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-Inf.fd191
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-LF.fd231
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-Numr.fd193
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-OsF.fd221
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-Sup.fd181
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-TLF.fd235
-rw-r--r--fonts/sourcesanspro/tex/LGRSourceSansPro-TOsF.fd219
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-Dnom.fd183
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-Inf.fd191
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-LF.fd229
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-Numr.fd189
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-OsF.fd235
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-Sup.fd181
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-TLF.fd227
-rw-r--r--fonts/sourcesanspro/tex/LY1SourceSansPro-TOsF.fd227
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-Dnom.fd179
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-Inf.fd185
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-LF.fd233
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-Numr.fd181
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-OsF.fd231
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-Sup.fd193
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-TLF.fd235
-rw-r--r--fonts/sourcesanspro/tex/OT1SourceSansPro-TOsF.fd233
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-Dnom.fd191
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-Inf.fd183
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-LF.fd225
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-Numr.fd189
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-OsF.fd235
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-Sup.fd187
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-TLF.fd235
-rw-r--r--fonts/sourcesanspro/tex/T1SourceSansPro-TOsF.fd231
-rw-r--r--fonts/sourcesanspro/tex/TS1SourceSansPro-LF.fd185
-rw-r--r--fonts/sourcesanspro/tex/TS1SourceSansPro-OsF.fd185
-rw-r--r--fonts/sourcesanspro/tex/TS1SourceSansPro-TLF.fd183
-rw-r--r--fonts/sourcesanspro/tex/TS1SourceSansPro-TOsF.fd183
-rw-r--r--fonts/sourcesanspro/tex/sourcesanspro-type1-autoinst.sty17
-rw-r--r--fonts/sourcesanspro/tex/sourcesanspro.sty8
38 files changed, 6046 insertions, 1377 deletions
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-Dnom.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-Dnom.fd
index 83cbb70906..d64ad3cd4e 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-Dnom.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-Dnom.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-Dnom.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-Dnom.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,86 +19,197 @@
\DeclareFontFamily{LGR}{SourceSansPro-Dnom}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{el}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-dnom-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{regular}{sl}{
+ <-> ssub * SourceSansPro-Dnom/regular/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-dnom-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{el}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-dnom-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{el}{sl}{
- <-> ssub * SourceSansPro-Dnom/el/it
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Dnom/extralight/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{b}{it}{
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-dnom-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-dnom-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{light}{sl}{
+ <-> ssub * SourceSansPro-Dnom/light/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-dnom-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-dnom-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/semibold/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{bold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BoldIt-dnom-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{b}{n}{
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-dnom-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{b}{sl}{
- <-> ssub * SourceSansPro-Dnom/b/it
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{bold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/bold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-lgr
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-dnom-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-dnom-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{m}{sl}{
- <-> ssub * SourceSansPro-Dnom/m/it
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{black}{sl}{
+ <-> ssub * SourceSansPro-Dnom/black/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-dnom-lgr
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{el}{n}{
+ <-> alias * SourceSansPro-Dnom/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{el}{sl}{
+ <-> alias * SourceSansPro-Dnom/extralight/sl
}{}
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{el}{it}{
+ <-> alias * SourceSansPro-Dnom/extralight/it
+}{}
+
+
+% l --> light
+
\DeclareFontShape{LGR}{SourceSansPro-Dnom}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-dnom-lgr
+ <-> alias * SourceSansPro-Dnom/light/n
}{}
\DeclareFontShape{LGR}{SourceSansPro-Dnom}{l}{sl}{
- <-> ssub * SourceSansPro-Dnom/l/it
+ <-> alias * SourceSansPro-Dnom/light/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-dnom-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{l}{it}{
+ <-> alias * SourceSansPro-Dnom/light/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-lgr
+
+% m --> regular
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{m}{sl}{
+ <-> alias * SourceSansPro-Dnom/regular/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{k}{sl}{
- <-> ssub * SourceSansPro-Dnom/k/it
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{m}{it}{
+ <-> alias * SourceSansPro-Dnom/regular/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-dnom-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{m}{n}{
+ <-> alias * SourceSansPro-Dnom/regular/n
}{}
+
+% sb --> semibold
+
\DeclareFontShape{LGR}{SourceSansPro-Dnom}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-dnom-lgr
+ <-> alias * SourceSansPro-Dnom/semibold/n
}{}
\DeclareFontShape{LGR}{SourceSansPro-Dnom}{sb}{sl}{
- <-> ssub * SourceSansPro-Dnom/sb/it
+ <-> alias * SourceSansPro-Dnom/semibold/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Dnom}{bx}{sl}{
- <-> ssub * SourceSansPro-Dnom/b/sl
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{sb}{it}{
+ <-> alias * SourceSansPro-Dnom/semibold/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{b}{it}{
+ <-> alias * SourceSansPro-Dnom/bold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{b}{sl}{
+ <-> alias * SourceSansPro-Dnom/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{b}{n}{
+ <-> alias * SourceSansPro-Dnom/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{eb}{n}{
+ <-> alias * SourceSansPro-Dnom/black/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{eb}{it}{
+ <-> alias * SourceSansPro-Dnom/black/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{eb}{sl}{
+ <-> alias * SourceSansPro-Dnom/black/sl
}{}
\DeclareFontShape{LGR}{SourceSansPro-Dnom}{bx}{n}{
<-> ssub * SourceSansPro-Dnom/b/n
}{}
+\DeclareFontShape{LGR}{SourceSansPro-Dnom}{bx}{sl}{
+ <-> ssub * SourceSansPro-Dnom/b/sl
+}{}
+
\DeclareFontShape{LGR}{SourceSansPro-Dnom}{bx}{it}{
<-> ssub * SourceSansPro-Dnom/b/it
}{}
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-Inf.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-Inf.fd
index 597caf5248..0c172042d9 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-Inf.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-Inf.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-Inf.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-Inf.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,76 +19,191 @@
\DeclareFontFamily{LGR}{SourceSansPro-Inf}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-inf-lgr
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-inf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-inf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-inf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{sb}{sl}{
- <-> ssub * SourceSansPro-Inf/sb/it
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{regular}{sl}{
+ <-> ssub * SourceSansPro-Inf/regular/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-lgr
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-inf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{l}{n}{
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Inf/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-inf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{l}{sl}{
- <-> ssub * SourceSansPro-Inf/l/it
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{light}{sl}{
+ <-> ssub * SourceSansPro-Inf/light/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Inf/semibold/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{bold}{sl}{
+ <-> ssub * SourceSansPro-Inf/bold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{k}{n}{
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-inf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{k}{sl}{
- <-> ssub * SourceSansPro-Inf/k/it
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{black}{sl}{
+ <-> ssub * SourceSansPro-Inf/black/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-inf-lgr
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{el}{n}{
+ <-> alias * SourceSansPro-Inf/extralight/n
}{}
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{el}{sl}{
+ <-> alias * SourceSansPro-Inf/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{el}{it}{
+ <-> alias * SourceSansPro-Inf/extralight/it
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{l}{it}{
+ <-> alias * SourceSansPro-Inf/light/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{l}{sl}{
+ <-> alias * SourceSansPro-Inf/light/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{l}{n}{
+ <-> alias * SourceSansPro-Inf/light/n
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{LGR}{SourceSansPro-Inf}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-inf-lgr
+ <-> alias * SourceSansPro-Inf/regular/n
}{}
\DeclareFontShape{LGR}{SourceSansPro-Inf}{m}{sl}{
- <-> ssub * SourceSansPro-Inf/m/it
+ <-> alias * SourceSansPro-Inf/regular/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{m}{it}{
+ <-> alias * SourceSansPro-Inf/regular/it
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{sb}{sl}{
+ <-> alias * SourceSansPro-Inf/semibold/sl
}{}
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{sb}{it}{
+ <-> alias * SourceSansPro-Inf/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{sb}{n}{
+ <-> alias * SourceSansPro-Inf/semibold/n
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{LGR}{SourceSansPro-Inf}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-lgr
+ <-> alias * SourceSansPro-Inf/bold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{b}{sl}{
+ <-> alias * SourceSansPro-Inf/bold/sl
}{}
\DeclareFontShape{LGR}{SourceSansPro-Inf}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-lgr
+ <-> alias * SourceSansPro-Inf/bold/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{b}{sl}{
- <-> ssub * SourceSansPro-Inf/b/it
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{eb}{sl}{
+ <-> alias * SourceSansPro-Inf/black/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-inf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{eb}{it}{
+ <-> alias * SourceSansPro-Inf/black/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-inf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{eb}{n}{
+ <-> alias * SourceSansPro-Inf/black/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{el}{sl}{
- <-> ssub * SourceSansPro-Inf/el/it
+\DeclareFontShape{LGR}{SourceSansPro-Inf}{bx}{it}{
+ <-> ssub * SourceSansPro-Inf/b/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-Inf}{bx}{sl}{
@@ -91,8 +214,4 @@
<-> ssub * SourceSansPro-Inf/b/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Inf}{bx}{it}{
- <-> ssub * SourceSansPro-Inf/b/it
-}{}
-
\endinput
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-LF.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-LF.fd
index 01bee43383..d6ac38c70d 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-LF.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-LF.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-LF.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,104 +19,235 @@
\DeclareFontFamily{LGR}{SourceSansPro-LF}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-lf-lgr
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{k}{sc}{
+\DeclareFontShape{LGR}{SourceSansPro-LF}{black}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Black-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-lf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{k}{sl}{
- <-> ssub * SourceSansPro-LF/k/it
+\DeclareFontShape{LGR}{SourceSansPro-LF}{black}{sl}{
+ <-> ssub * SourceSansPro-LF/black/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-lgr
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-lf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-lf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{sl}{
- <-> ssub * SourceSansPro-LF/l/it
+\DeclareFontShape{LGR}{SourceSansPro-LF}{bold}{sl}{
+ <-> ssub * SourceSansPro-LF/bold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-lgr
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-lf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{n}{
+\DeclareFontShape{LGR}{SourceSansPro-LF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{regular}{sl}{
+ <-> ssub * SourceSansPro-LF/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{sc}{
+\DeclareFontShape{LGR}{SourceSansPro-LF}{semibold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{sl}{
- <-> ssub * SourceSansPro-LF/sb/it
+\DeclareFontShape{LGR}{SourceSansPro-LF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-LF/semibold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{el}{sc}{
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{extralight}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{el}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-LF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-lgr
}{}
+\DeclareFontShape{LGR}{SourceSansPro-LF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-LF/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-lf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-lf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{light}{sl}{
+ <-> ssub * SourceSansPro-LF/light/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{el}{it}{
+ <-> alias * SourceSansPro-LF/extralight/it
+}{}
+
\DeclareFontShape{LGR}{SourceSansPro-LF}{el}{sl}{
- <-> ssub * SourceSansPro-LF/el/it
+ <-> alias * SourceSansPro-LF/extralight/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{el}{sc}{
+ <-> alias * SourceSansPro-LF/extralight/sc
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{el}{n}{
+ <-> alias * SourceSansPro-LF/extralight/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-lgr
+
+% l --> light
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{sl}{
+ <-> alias * SourceSansPro-LF/light/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{sl}{
- <-> ssub * SourceSansPro-LF/b/it
+\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{it}{
+ <-> alias * SourceSansPro-LF/light/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{n}{
+ <-> alias * SourceSansPro-LF/light/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{l}{sc}{
+ <-> alias * SourceSansPro-LF/light/sc
}{}
+
+% m --> regular
+
\DeclareFontShape{LGR}{SourceSansPro-LF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-lgr
+ <-> alias * SourceSansPro-LF/regular/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-lf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-LF}{m}{sc}{
+ <-> alias * SourceSansPro-LF/regular/sc
}{}
\DeclareFontShape{LGR}{SourceSansPro-LF}{m}{sl}{
- <-> ssub * SourceSansPro-LF/m/it
+ <-> alias * SourceSansPro-LF/regular/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-LF}{bx}{sl}{
- <-> ssub * SourceSansPro-LF/b/sl
+\DeclareFontShape{LGR}{SourceSansPro-LF}{m}{it}{
+ <-> alias * SourceSansPro-LF/regular/it
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{n}{
+ <-> alias * SourceSansPro-LF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{sc}{
+ <-> alias * SourceSansPro-LF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{sl}{
+ <-> alias * SourceSansPro-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{sb}{it}{
+ <-> alias * SourceSansPro-LF/semibold/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{n}{
+ <-> alias * SourceSansPro-LF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{sc}{
+ <-> alias * SourceSansPro-LF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{sl}{
+ <-> alias * SourceSansPro-LF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{b}{it}{
+ <-> alias * SourceSansPro-LF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{eb}{n}{
+ <-> alias * SourceSansPro-LF/black/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{eb}{sc}{
+ <-> alias * SourceSansPro-LF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{eb}{sl}{
+ <-> alias * SourceSansPro-LF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-LF}{eb}{it}{
+ <-> alias * SourceSansPro-LF/black/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-LF}{bx}{sc}{
@@ -123,4 +262,8 @@
<-> ssub * SourceSansPro-LF/b/it
}{}
+\DeclareFontShape{LGR}{SourceSansPro-LF}{bx}{sl}{
+ <-> ssub * SourceSansPro-LF/b/sl
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-Numr.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-Numr.fd
index ecbda03b57..46a8cf91d0 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-Numr.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-Numr.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-Numr.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-Numr.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,88 +19,199 @@
\DeclareFontFamily{LGR}{SourceSansPro-Numr}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-numr-lgr
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-numr-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-numr-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-numr-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{l}{sl}{
- <-> ssub * SourceSansPro-Numr/l/it
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{black}{sl}{
+ <-> ssub * SourceSansPro-Numr/black/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-numr-lgr
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-numr-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-numr-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{k}{sl}{
- <-> ssub * SourceSansPro-Numr/k/it
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{bold}{sl}{
+ <-> ssub * SourceSansPro-Numr/bold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{sb}{it}{
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-numr-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-numr-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{regular}{sl}{
+ <-> ssub * SourceSansPro-Numr/regular/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Numr/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-numr-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-numr-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{light}{sl}{
+ <-> ssub * SourceSansPro-Numr/light/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-numr-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{sb}{n}{
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-numr-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{sb}{sl}{
- <-> ssub * SourceSansPro-Numr/sb/it
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Numr/semibold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{el}{sl}{
+ <-> alias * SourceSansPro-Numr/extralight/sl
}{}
\DeclareFontShape{LGR}{SourceSansPro-Numr}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-lgr
+ <-> alias * SourceSansPro-Numr/extralight/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-Numr}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-lgr
+ <-> alias * SourceSansPro-Numr/extralight/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{el}{sl}{
- <-> ssub * SourceSansPro-Numr/el/it
+
+% l --> light
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{l}{it}{
+ <-> alias * SourceSansPro-Numr/light/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-numr-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{l}{sl}{
+ <-> alias * SourceSansPro-Numr/light/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{l}{n}{
+ <-> alias * SourceSansPro-Numr/light/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{b}{sl}{
- <-> ssub * SourceSansPro-Numr/b/it
+
+% m --> regular
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{m}{it}{
+ <-> alias * SourceSansPro-Numr/regular/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{m}{sl}{
+ <-> alias * SourceSansPro-Numr/regular/sl
}{}
\DeclareFontShape{LGR}{SourceSansPro-Numr}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-numr-lgr
+ <-> alias * SourceSansPro-Numr/regular/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-numr-lgr
+
+% sb --> semibold
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{sb}{n}{
+ <-> alias * SourceSansPro-Numr/semibold/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{m}{sl}{
- <-> ssub * SourceSansPro-Numr/m/it
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{sb}{it}{
+ <-> alias * SourceSansPro-Numr/semibold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{bx}{it}{
- <-> ssub * SourceSansPro-Numr/b/it
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{sb}{sl}{
+ <-> alias * SourceSansPro-Numr/semibold/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Numr}{bx}{n}{
- <-> ssub * SourceSansPro-Numr/b/n
+
+% b --> bold
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{b}{sl}{
+ <-> alias * SourceSansPro-Numr/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{b}{it}{
+ <-> alias * SourceSansPro-Numr/bold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{b}{n}{
+ <-> alias * SourceSansPro-Numr/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{eb}{n}{
+ <-> alias * SourceSansPro-Numr/black/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{eb}{it}{
+ <-> alias * SourceSansPro-Numr/black/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{eb}{sl}{
+ <-> alias * SourceSansPro-Numr/black/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{bx}{it}{
+ <-> ssub * SourceSansPro-Numr/b/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-Numr}{bx}{sl}{
<-> ssub * SourceSansPro-Numr/b/sl
}{}
+\DeclareFontShape{LGR}{SourceSansPro-Numr}{bx}{n}{
+ <-> ssub * SourceSansPro-Numr/b/n
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-OsF.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-OsF.fd
index a5fc6345eb..3a1e0cf89f 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-OsF.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-OsF.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-OsF.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-OsF.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,100 +19,235 @@
\DeclareFontFamily{LGR}{SourceSansPro-OsF}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-lgr
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{n}{
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-OsF/regular/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-osf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{sc}{
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{light}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Light-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{sl}{
- <-> ssub * SourceSansPro-OsF/l/it
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-osf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{light}{sl}{
+ <-> ssub * SourceSansPro-OsF/light/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-osf-sc-lgr
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{k}{sl}{
- <-> ssub * SourceSansPro-OsF/k/it
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-OsF/extralight/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{it}{
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{n}{
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{sc}{
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{semibold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{sl}{
- <-> ssub * SourceSansPro-OsF/sb/it
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-OsF/semibold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-osf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{sc}{
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{bold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-osf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-OsF/bold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{sl}{
- <-> ssub * SourceSansPro-OsF/b/it
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-osf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-osf-sc-lgr
}{}
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{black}{sl}{
+ <-> ssub * SourceSansPro-OsF/black/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{it}{
+ <-> alias * SourceSansPro-OsF/extralight/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{sl}{
+ <-> alias * SourceSansPro-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{sc}{
+ <-> alias * SourceSansPro-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{n}{
+ <-> alias * SourceSansPro-OsF/extralight/n
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{sl}{
+ <-> alias * SourceSansPro-OsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{it}{
+ <-> alias * SourceSansPro-OsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{n}{
+ <-> alias * SourceSansPro-OsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{l}{sc}{
+ <-> alias * SourceSansPro-OsF/light/sc
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{LGR}{SourceSansPro-OsF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-lgr
+ <-> alias * SourceSansPro-OsF/regular/sc
}{}
\DeclareFontShape{LGR}{SourceSansPro-OsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-lgr
+ <-> alias * SourceSansPro-OsF/regular/n
}{}
\DeclareFontShape{LGR}{SourceSansPro-OsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-osf-lgr
+ <-> alias * SourceSansPro-OsF/regular/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-OsF}{m}{sl}{
- <-> ssub * SourceSansPro-OsF/m/it
+ <-> alias * SourceSansPro-OsF/regular/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-lgr
+
+% sb --> semibold
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{sc}{
+ <-> alias * SourceSansPro-OsF/semibold/sc
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{n}{
+ <-> alias * SourceSansPro-OsF/semibold/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{it}{
+ <-> alias * SourceSansPro-OsF/semibold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-OsF}{el}{sl}{
- <-> ssub * SourceSansPro-OsF/el/it
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{sb}{sl}{
+ <-> alias * SourceSansPro-OsF/semibold/sl
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{sl}{
+ <-> alias * SourceSansPro-OsF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{it}{
+ <-> alias * SourceSansPro-OsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{n}{
+ <-> alias * SourceSansPro-OsF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{b}{sc}{
+ <-> alias * SourceSansPro-OsF/bold/sc
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{eb}{n}{
+ <-> alias * SourceSansPro-OsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{eb}{sc}{
+ <-> alias * SourceSansPro-OsF/black/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{eb}{sl}{
+ <-> alias * SourceSansPro-OsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-OsF}{eb}{it}{
+ <-> alias * SourceSansPro-OsF/black/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-OsF}{bx}{sl}{
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-Sup.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-Sup.fd
index 2835fcdd0c..82b9483581 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-Sup.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-Sup.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-Sup.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,76 +19,187 @@
\DeclareFontFamily{LGR}{SourceSansPro-Sup}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{el}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{regular}{sl}{
+ <-> ssub * SourceSansPro-Sup/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Sup/semibold/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-sup-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{el}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-sup-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{el}{sl}{
- <-> ssub * SourceSansPro-Sup/el/it
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Sup/extralight/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{b}{n}{
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-sup-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{light}{sl}{
+ <-> ssub * SourceSansPro-Sup/light/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-sup-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{b}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{bold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BoldIt-sup-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{b}{sl}{
- <-> ssub * SourceSansPro-Sup/b/it
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{bold}{sl}{
+ <-> ssub * SourceSansPro-Sup/bold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-sup-lgr
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-sup-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-sup-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-sup-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{m}{sl}{
- <-> ssub * SourceSansPro-Sup/m/it
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{black}{sl}{
+ <-> ssub * SourceSansPro-Sup/black/it
}{}
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{el}{n}{
+ <-> alias * SourceSansPro-Sup/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{el}{sl}{
+ <-> alias * SourceSansPro-Sup/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{el}{it}{
+ <-> alias * SourceSansPro-Sup/extralight/it
+}{}
+
+
+% l --> light
+
\DeclareFontShape{LGR}{SourceSansPro-Sup}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-sup-lgr
+ <-> alias * SourceSansPro-Sup/light/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{l}{sl}{
+ <-> alias * SourceSansPro-Sup/light/sl
}{}
\DeclareFontShape{LGR}{SourceSansPro-Sup}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-sup-lgr
+ <-> alias * SourceSansPro-Sup/light/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{l}{sl}{
- <-> ssub * SourceSansPro-Sup/l/it
+
+% m --> regular
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{m}{n}{
+ <-> alias * SourceSansPro-Sup/regular/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-sup-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{m}{it}{
+ <-> alias * SourceSansPro-Sup/regular/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-sup-lgr
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{m}{sl}{
+ <-> alias * SourceSansPro-Sup/regular/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{k}{sl}{
- <-> ssub * SourceSansPro-Sup/k/it
+
+% sb --> semibold
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{sb}{sl}{
+ <-> alias * SourceSansPro-Sup/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{sb}{it}{
+ <-> alias * SourceSansPro-Sup/semibold/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-Sup}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-lgr
+ <-> alias * SourceSansPro-Sup/semibold/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-sup-lgr
+
+% b --> bold
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{b}{sl}{
+ <-> alias * SourceSansPro-Sup/bold/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-Sup}{sb}{sl}{
- <-> ssub * SourceSansPro-Sup/sb/it
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{b}{it}{
+ <-> alias * SourceSansPro-Sup/bold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{b}{n}{
+ <-> alias * SourceSansPro-Sup/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{eb}{n}{
+ <-> alias * SourceSansPro-Sup/black/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{eb}{sl}{
+ <-> alias * SourceSansPro-Sup/black/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-Sup}{eb}{it}{
+ <-> alias * SourceSansPro-Sup/black/it
}{}
\DeclareFontShape{LGR}{SourceSansPro-Sup}{bx}{n}{
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-TLF.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-TLF.fd
index 10bf129d7b..8c632fafac 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-TLF.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-TLF.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-TLF.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,106 +19,245 @@
\DeclareFontFamily{LGR}{SourceSansPro-TLF}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-lgr
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{black}{sl}{
+ <-> ssub * SourceSansPro-TLF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{bold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{sl}{
- <-> ssub * SourceSansPro-TLF/b/it
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TLF/bold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tlf-lgr
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{sl}{
- <-> ssub * SourceSansPro-TLF/m/it
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{sc}{
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TLF/semibold/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{extralight}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{n}{
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{sl}{
- <-> ssub * SourceSansPro-TLF/el/it
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TLF/extralight/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{l}{n}{
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tlf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{l}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-tlf-lgr
}{}
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{light}{sl}{
+ <-> ssub * SourceSansPro-TLF/light/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{n}{
+ <-> alias * SourceSansPro-TLF/extralight/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{sc}{
+ <-> alias * SourceSansPro-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{sl}{
+ <-> alias * SourceSansPro-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{el}{it}{
+ <-> alias * SourceSansPro-TLF/extralight/it
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{l}{it}{
+ <-> alias * SourceSansPro-TLF/light/it
+}{}
+
\DeclareFontShape{LGR}{SourceSansPro-TLF}{l}{sl}{
- <-> ssub * SourceSansPro-TLF/l/it
+ <-> alias * SourceSansPro-TLF/light/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{l}{sc}{
+ <-> alias * SourceSansPro-TLF/light/sc
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{l}{n}{
+ <-> alias * SourceSansPro-TLF/light/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-lgr
+
+% m --> regular
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{sl}{
+ <-> alias * SourceSansPro-TLF/regular/sl
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{k}{sl}{
- <-> ssub * SourceSansPro-TLF/k/it
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{it}{
+ <-> alias * SourceSansPro-TLF/regular/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{n}{
+ <-> alias * SourceSansPro-TLF/regular/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{m}{sc}{
+ <-> alias * SourceSansPro-TLF/regular/sc
}{}
+
+% sb --> semibold
+
\DeclareFontShape{LGR}{SourceSansPro-TLF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-lgr
+ <-> alias * SourceSansPro-TLF/semibold/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{sb}{sc}{
+ <-> alias * SourceSansPro-TLF/semibold/sc
}{}
\DeclareFontShape{LGR}{SourceSansPro-TLF}{sb}{sl}{
- <-> ssub * SourceSansPro-TLF/sb/it
+ <-> alias * SourceSansPro-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{sb}{it}{
+ <-> alias * SourceSansPro-TLF/semibold/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{n}{
+ <-> alias * SourceSansPro-TLF/bold/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{sc}{
+ <-> alias * SourceSansPro-TLF/bold/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{sl}{
+ <-> alias * SourceSansPro-TLF/bold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{b}{it}{
+ <-> alias * SourceSansPro-TLF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{eb}{sl}{
+ <-> alias * SourceSansPro-TLF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{eb}{it}{
+ <-> alias * SourceSansPro-TLF/black/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{eb}{n}{
+ <-> alias * SourceSansPro-TLF/black/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{eb}{sc}{
+ <-> alias * SourceSansPro-TLF/black/sc
}{}
\DeclareFontShape{LGR}{SourceSansPro-TLF}{bx}{it}{
<-> ssub * SourceSansPro-TLF/b/it
}{}
+\DeclareFontShape{LGR}{SourceSansPro-TLF}{bx}{sl}{
+ <-> ssub * SourceSansPro-TLF/b/sl
+}{}
+
\DeclareFontShape{LGR}{SourceSansPro-TLF}{bx}{sc}{
<-> ssub * SourceSansPro-TLF/b/sc
}{}
@@ -119,8 +266,4 @@
<-> ssub * SourceSansPro-TLF/b/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TLF}{bx}{sl}{
- <-> ssub * SourceSansPro-TLF/b/sl
-}{}
-
\endinput
diff --git a/fonts/sourcesanspro/tex/LGRSourceSansPro-TOsF.fd b/fonts/sourcesanspro/tex/LGRSourceSansPro-TOsF.fd
index a3eb2601db..ba8b1fd89c 100644
--- a/fonts/sourcesanspro/tex/LGRSourceSansPro-TOsF.fd
+++ b/fonts/sourcesanspro/tex/LGRSourceSansPro-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LGRSourceSansPro-TOsF.fd}
- [2016/12/03 (autoinst) Font definitions for LGR/SourceSansPro-TOsF.]
+ [2020/01/19 (autoinst) Font definitions for LGR/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,100 +19,235 @@
\DeclareFontFamily{LGR}{SourceSansPro-TOsF}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-lgr
+
+% ---- regular ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tosf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{sl}{
- <-> ssub * SourceSansPro-TOsF/sb/it
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TOsF/regular/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-lgr
+
+% ---- extralight ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{sc}{
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TOsF/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{light}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{sl}{
- <-> ssub * SourceSansPro-TOsF/l/it
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{light}{sl}{
+ <-> ssub * SourceSansPro-TOsF/light/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-lgr
+
+% ---- semibold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/semibold/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{k}{sc}{
+
+% ---- black ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{black}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tosf-sc-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{k}{it}{
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{black}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-lgr
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{k}{sl}{
- <-> ssub * SourceSansPro-TOsF/k/it
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{black}{sl}{
+ <-> ssub * SourceSansPro-TOsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-lgr
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-lgr
}{}
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-lgr
+ <-> alias * SourceSansPro-TOsF/extralight/it
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-lgr
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{el}{sl}{
+ <-> alias * SourceSansPro-TOsF/extralight/sl
}{}
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-sc-lgr
+ <-> alias * SourceSansPro-TOsF/extralight/sc
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{el}{sl}{
- <-> ssub * SourceSansPro-TOsF/el/it
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{el}{n}{
+ <-> alias * SourceSansPro-TOsF/extralight/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tosf-lgr
+
+% l --> light
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{sl}{
+ <-> alias * SourceSansPro-TOsF/light/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{it}{
+ <-> alias * SourceSansPro-TOsF/light/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{n}{
+ <-> alias * SourceSansPro-TOsF/light/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{l}{sc}{
+ <-> alias * SourceSansPro-TOsF/light/sc
}{}
+
+% m --> regular
+
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-lgr
+ <-> alias * SourceSansPro-TOsF/regular/n
}{}
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-sc-lgr
+ <-> alias * SourceSansPro-TOsF/regular/sc
}{}
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{m}{sl}{
- <-> ssub * SourceSansPro-TOsF/m/it
+ <-> alias * SourceSansPro-TOsF/regular/sl
}{}
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{m}{it}{
+ <-> alias * SourceSansPro-TOsF/regular/it
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{it}{
+ <-> alias * SourceSansPro-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{sl}{
+ <-> alias * SourceSansPro-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{sc}{
+ <-> alias * SourceSansPro-TOsF/semibold/sc
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{sb}{n}{
+ <-> alias * SourceSansPro-TOsF/semibold/n
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-lgr
+ <-> alias * SourceSansPro-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{b}{sl}{
+ <-> alias * SourceSansPro-TOsF/bold/sl
}{}
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-lgr
+ <-> alias * SourceSansPro-TOsF/bold/sc
}{}
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-lgr
+ <-> alias * SourceSansPro-TOsF/bold/n
}{}
-\DeclareFontShape{LGR}{SourceSansPro-TOsF}{b}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/it
+
+% eb --> black
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{eb}{sl}{
+ <-> alias * SourceSansPro-TOsF/black/sl
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{eb}{it}{
+ <-> alias * SourceSansPro-TOsF/black/it
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{eb}{n}{
+ <-> alias * SourceSansPro-TOsF/black/n
+}{}
+
+\DeclareFontShape{LGR}{SourceSansPro-TOsF}{eb}{sc}{
+ <-> alias * SourceSansPro-TOsF/black/sc
}{}
\DeclareFontShape{LGR}{SourceSansPro-TOsF}{bx}{sc}{
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-Dnom.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-Dnom.fd
index a0ab87f06b..81f0616d37 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-Dnom.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-Dnom.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-Dnom.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-Dnom.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,86 +19,197 @@
\DeclareFontFamily{LY1}{SourceSansPro-Dnom}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{sb}{n}{
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-dnom-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-dnom-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{sb}{sl}{
- <-> ssub * SourceSansPro-Dnom/sb/it
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-dnom-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{l}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-dnom-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-dnom-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{light}{sl}{
+ <-> ssub * SourceSansPro-Dnom/light/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{l}{sl}{
- <-> ssub * SourceSansPro-Dnom/l/it
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-dnom-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Dnom/extralight/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{k}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{regular}{sl}{
+ <-> ssub * SourceSansPro-Dnom/regular/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-dnom-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{k}{sl}{
- <-> ssub * SourceSansPro-Dnom/k/it
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-dnom-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{black}{sl}{
+ <-> ssub * SourceSansPro-Dnom/black/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-dnom-ly1
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-dnom-ly1
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-dnom-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{bold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{LY1}{SourceSansPro-Dnom}{el}{sl}{
- <-> ssub * SourceSansPro-Dnom/el/it
+ <-> alias * SourceSansPro-Dnom/extralight/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-dnom-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{el}{it}{
+ <-> alias * SourceSansPro-Dnom/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{el}{n}{
+ <-> alias * SourceSansPro-Dnom/extralight/n
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{l}{n}{
+ <-> alias * SourceSansPro-Dnom/light/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{l}{it}{
+ <-> alias * SourceSansPro-Dnom/light/it
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{l}{sl}{
+ <-> alias * SourceSansPro-Dnom/light/sl
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{LY1}{SourceSansPro-Dnom}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-ly1
+ <-> alias * SourceSansPro-Dnom/regular/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-Dnom}{m}{sl}{
- <-> ssub * SourceSansPro-Dnom/m/it
+ <-> alias * SourceSansPro-Dnom/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{m}{it}{
+ <-> alias * SourceSansPro-Dnom/regular/it
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{sb}{it}{
+ <-> alias * SourceSansPro-Dnom/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{sb}{sl}{
+ <-> alias * SourceSansPro-Dnom/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{sb}{n}{
+ <-> alias * SourceSansPro-Dnom/semibold/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{b}{sl}{
+ <-> alias * SourceSansPro-Dnom/bold/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-Dnom}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-dnom-ly1
+ <-> alias * SourceSansPro-Dnom/bold/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-Dnom}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-dnom-ly1
+ <-> alias * SourceSansPro-Dnom/bold/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{b}{sl}{
- <-> ssub * SourceSansPro-Dnom/b/it
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{eb}{it}{
+ <-> alias * SourceSansPro-Dnom/black/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Dnom}{bx}{sl}{
- <-> ssub * SourceSansPro-Dnom/b/sl
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{eb}{sl}{
+ <-> alias * SourceSansPro-Dnom/black/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{eb}{n}{
+ <-> alias * SourceSansPro-Dnom/black/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-Dnom}{bx}{n}{
<-> ssub * SourceSansPro-Dnom/b/n
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Dnom}{bx}{sl}{
+ <-> ssub * SourceSansPro-Dnom/b/sl
+}{}
+
\DeclareFontShape{LY1}{SourceSansPro-Dnom}{bx}{it}{
<-> ssub * SourceSansPro-Dnom/b/it
}{}
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-Inf.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-Inf.fd
index 32f439ef04..15c3aa2b88 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-Inf.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-Inf.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-Inf.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-Inf.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,86 +19,197 @@
\DeclareFontFamily{LY1}{SourceSansPro-Inf}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-inf-ly1
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-inf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{el}{sl}{
- <-> ssub * SourceSansPro-Inf/el/it
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{black}{sl}{
+ <-> ssub * SourceSansPro-Inf/black/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-inf-ly1
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-inf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{m}{sl}{
- <-> ssub * SourceSansPro-Inf/m/it
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{bold}{sl}{
+ <-> ssub * SourceSansPro-Inf/bold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-ly1
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{b}{sl}{
- <-> ssub * SourceSansPro-Inf/b/it
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{regular}{sl}{
+ <-> ssub * SourceSansPro-Inf/regular/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{sb}{n}{
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{sb}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{sb}{sl}{
- <-> ssub * SourceSansPro-Inf/sb/it
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Inf/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-inf-ly1
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-inf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{light}{sl}{
+ <-> ssub * SourceSansPro-Inf/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-inf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Inf/extralight/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{el}{it}{
+ <-> alias * SourceSansPro-Inf/extralight/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{k}{sl}{
- <-> ssub * SourceSansPro-Inf/k/it
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{el}{sl}{
+ <-> alias * SourceSansPro-Inf/extralight/sl
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{el}{n}{
+ <-> alias * SourceSansPro-Inf/extralight/n
+}{}
+
+
+% l --> light
+
\DeclareFontShape{LY1}{SourceSansPro-Inf}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-inf-ly1
+ <-> alias * SourceSansPro-Inf/light/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{l}{sl}{
+ <-> alias * SourceSansPro-Inf/light/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-Inf}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-ly1
+ <-> alias * SourceSansPro-Inf/light/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{l}{sl}{
- <-> ssub * SourceSansPro-Inf/l/it
+
+% m --> regular
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{m}{it}{
+ <-> alias * SourceSansPro-Inf/regular/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Inf}{bx}{sl}{
- <-> ssub * SourceSansPro-Inf/b/sl
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{m}{sl}{
+ <-> alias * SourceSansPro-Inf/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{m}{n}{
+ <-> alias * SourceSansPro-Inf/regular/n
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{sb}{sl}{
+ <-> alias * SourceSansPro-Inf/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{sb}{it}{
+ <-> alias * SourceSansPro-Inf/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{sb}{n}{
+ <-> alias * SourceSansPro-Inf/semibold/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{b}{n}{
+ <-> alias * SourceSansPro-Inf/bold/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{b}{sl}{
+ <-> alias * SourceSansPro-Inf/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{b}{it}{
+ <-> alias * SourceSansPro-Inf/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{eb}{sl}{
+ <-> alias * SourceSansPro-Inf/black/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{eb}{it}{
+ <-> alias * SourceSansPro-Inf/black/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{eb}{n}{
+ <-> alias * SourceSansPro-Inf/black/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-Inf}{bx}{n}{
<-> ssub * SourceSansPro-Inf/b/n
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Inf}{bx}{sl}{
+ <-> ssub * SourceSansPro-Inf/b/sl
+}{}
+
\DeclareFontShape{LY1}{SourceSansPro-Inf}{bx}{it}{
<-> ssub * SourceSansPro-Inf/b/it
}{}
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-LF.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-LF.fd
index 6efdaad1f6..99eb3d2c79 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-LF.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-LF.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-LF.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,104 +19,235 @@
\DeclareFontFamily{LY1}{SourceSansPro-LF}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-ly1
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-LF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-LF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{sl}{
- <-> ssub * SourceSansPro-LF/sb/it
+\DeclareFontShape{LY1}{SourceSansPro-LF}{regular}{sl}{
+ <-> ssub * SourceSansPro-LF/regular/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-ly1
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-lf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-LF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-lf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-LF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{k}{sl}{
- <-> ssub * SourceSansPro-LF/k/it
+\DeclareFontShape{LY1}{SourceSansPro-LF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-LF/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{sc}{
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{light}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Light-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-LF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-LF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{sl}{
- <-> ssub * SourceSansPro-LF/l/it
+\DeclareFontShape{LY1}{SourceSansPro-LF}{light}{sl}{
+ <-> ssub * SourceSansPro-LF/light/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-lf-ly1
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-LF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-LF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{sl}{
- <-> ssub * SourceSansPro-LF/m/it
+\DeclareFontShape{LY1}{SourceSansPro-LF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-LF/extralight/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{sc}{
+\DeclareFontShape{LY1}{SourceSansPro-LF}{bold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-lf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-LF}{bold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{sl}{
- <-> ssub * SourceSansPro-LF/b/it
+\DeclareFontShape{LY1}{SourceSansPro-LF}{bold}{sl}{
+ <-> ssub * SourceSansPro-LF/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-ly1
}{}
+\DeclareFontShape{LY1}{SourceSansPro-LF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-lf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-lf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{black}{sl}{
+ <-> ssub * SourceSansPro-LF/black/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{LY1}{SourceSansPro-LF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-ly1
+ <-> alias * SourceSansPro-LF/extralight/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-LF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-sc-ly1
+ <-> alias * SourceSansPro-LF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{el}{sl}{
+ <-> alias * SourceSansPro-LF/extralight/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-LF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-ly1
+ <-> alias * SourceSansPro-LF/extralight/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{el}{sl}{
- <-> ssub * SourceSansPro-LF/el/it
+
+% l --> light
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{n}{
+ <-> alias * SourceSansPro-LF/light/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-LF}{bx}{it}{
- <-> ssub * SourceSansPro-LF/b/it
+\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{sc}{
+ <-> alias * SourceSansPro-LF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{sl}{
+ <-> alias * SourceSansPro-LF/light/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{l}{it}{
+ <-> alias * SourceSansPro-LF/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{it}{
+ <-> alias * SourceSansPro-LF/regular/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{sl}{
+ <-> alias * SourceSansPro-LF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{sc}{
+ <-> alias * SourceSansPro-LF/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{m}{n}{
+ <-> alias * SourceSansPro-LF/regular/n
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{sl}{
+ <-> alias * SourceSansPro-LF/semibold/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{it}{
+ <-> alias * SourceSansPro-LF/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{n}{
+ <-> alias * SourceSansPro-LF/semibold/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{sb}{sc}{
+ <-> alias * SourceSansPro-LF/semibold/sc
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{n}{
+ <-> alias * SourceSansPro-LF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{sc}{
+ <-> alias * SourceSansPro-LF/bold/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{sl}{
+ <-> alias * SourceSansPro-LF/bold/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{b}{it}{
+ <-> alias * SourceSansPro-LF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{eb}{n}{
+ <-> alias * SourceSansPro-LF/black/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{eb}{sc}{
+ <-> alias * SourceSansPro-LF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{eb}{sl}{
+ <-> alias * SourceSansPro-LF/black/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-LF}{eb}{it}{
+ <-> alias * SourceSansPro-LF/black/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-LF}{bx}{n}{
@@ -123,4 +262,8 @@
<-> ssub * SourceSansPro-LF/b/sl
}{}
+\DeclareFontShape{LY1}{SourceSansPro-LF}{bx}{it}{
+ <-> ssub * SourceSansPro-LF/b/it
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-Numr.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-Numr.fd
index 0269778aab..1555f65941 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-Numr.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-Numr.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-Numr.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-Numr.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,88 +19,199 @@
\DeclareFontFamily{LY1}{SourceSansPro-Numr}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-numr-ly1
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-numr-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{m}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{light}{sl}{
+ <-> ssub * SourceSansPro-Numr/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Numr/extralight/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Numr/semibold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{regular}{it}{
<-> \SourceSansPro@@scale SourceSansPro-It-numr-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{m}{sl}{
- <-> ssub * SourceSansPro-Numr/m/it
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-numr-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{regular}{sl}{
+ <-> ssub * SourceSansPro-Numr/regular/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-numr-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{b}{sl}{
- <-> ssub * SourceSansPro-Numr/b/it
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{bold}{sl}{
+ <-> ssub * SourceSansPro-Numr/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-numr-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{black}{sl}{
+ <-> ssub * SourceSansPro-Numr/black/it
}{}
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{LY1}{SourceSansPro-Numr}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-ly1
+ <-> alias * SourceSansPro-Numr/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{el}{it}{
+ <-> alias * SourceSansPro-Numr/extralight/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-Numr}{el}{sl}{
- <-> ssub * SourceSansPro-Numr/el/it
+ <-> alias * SourceSansPro-Numr/extralight/sl
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{l}{it}{
+ <-> alias * SourceSansPro-Numr/light/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{l}{sl}{
+ <-> alias * SourceSansPro-Numr/light/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{l}{n}{
+ <-> alias * SourceSansPro-Numr/light/n
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{m}{n}{
+ <-> alias * SourceSansPro-Numr/regular/n
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{m}{it}{
+ <-> alias * SourceSansPro-Numr/regular/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{m}{sl}{
+ <-> alias * SourceSansPro-Numr/regular/sl
+}{}
+
+
+% sb --> semibold
+
\DeclareFontShape{LY1}{SourceSansPro-Numr}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-numr-ly1
+ <-> alias * SourceSansPro-Numr/semibold/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-Numr}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-numr-ly1
+ <-> alias * SourceSansPro-Numr/semibold/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-Numr}{sb}{sl}{
- <-> ssub * SourceSansPro-Numr/sb/it
+ <-> alias * SourceSansPro-Numr/semibold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-numr-ly1
+
+% b --> bold
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{b}{n}{
+ <-> alias * SourceSansPro-Numr/bold/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-numr-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{b}{it}{
+ <-> alias * SourceSansPro-Numr/bold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{k}{sl}{
- <-> ssub * SourceSansPro-Numr/k/it
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{b}{sl}{
+ <-> alias * SourceSansPro-Numr/bold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-numr-ly1
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{eb}{sl}{
+ <-> alias * SourceSansPro-Numr/black/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-numr-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{eb}{it}{
+ <-> alias * SourceSansPro-Numr/black/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{l}{sl}{
- <-> ssub * SourceSansPro-Numr/l/it
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{eb}{n}{
+ <-> alias * SourceSansPro-Numr/black/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-Numr}{bx}{sl}{
<-> ssub * SourceSansPro-Numr/b/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Numr}{bx}{n}{
- <-> ssub * SourceSansPro-Numr/b/n
-}{}
-
\DeclareFontShape{LY1}{SourceSansPro-Numr}{bx}{it}{
<-> ssub * SourceSansPro-Numr/b/it
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Numr}{bx}{n}{
+ <-> ssub * SourceSansPro-Numr/b/n
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-OsF.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-OsF.fd
index 199b4e4cf7..4bea4293d1 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-OsF.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-OsF.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-OsF.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-OsF.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,116 +19,251 @@
\DeclareFontFamily{LY1}{SourceSansPro-OsF}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-ly1
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-osf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-OsF/regular/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{light}{sl}{
+ <-> ssub * SourceSansPro-OsF/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-OsF/extralight/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{sl}{
- <-> ssub * SourceSansPro-OsF/sb/it
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-OsF/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{k}{sc}{
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{black}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Black-osf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{k}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-osf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{k}{sl}{
- <-> ssub * SourceSansPro-OsF/k/it
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{black}{sl}{
+ <-> ssub * SourceSansPro-OsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-osf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-OsF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{it}{
+ <-> alias * SourceSansPro-OsF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{sl}{
+ <-> alias * SourceSansPro-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{sc}{
+ <-> alias * SourceSansPro-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{n}{
+ <-> alias * SourceSansPro-OsF/extralight/n
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{l}{sl}{
+ <-> alias * SourceSansPro-OsF/light/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-OsF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-ly1
+ <-> alias * SourceSansPro-OsF/light/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-OsF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-osf-ly1
+ <-> alias * SourceSansPro-OsF/light/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-OsF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-osf-sc-ly1
+ <-> alias * SourceSansPro-OsF/light/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{l}{sl}{
- <-> ssub * SourceSansPro-OsF/l/it
-}{}
+
+% m --> regular
\DeclareFontShape{LY1}{SourceSansPro-OsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-osf-ly1
+ <-> alias * SourceSansPro-OsF/regular/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{m}{sl}{
+ <-> alias * SourceSansPro-OsF/regular/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-OsF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-ly1
+ <-> alias * SourceSansPro-OsF/regular/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{m}{sl}{
- <-> ssub * SourceSansPro-OsF/m/it
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{m}{n}{
+ <-> alias * SourceSansPro-OsF/regular/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-ly1
+
+% sb --> semibold
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{sl}{
+ <-> alias * SourceSansPro-OsF/semibold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-osf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{it}{
+ <-> alias * SourceSansPro-OsF/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-osf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{n}{
+ <-> alias * SourceSansPro-OsF/semibold/n
}{}
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{sb}{sc}{
+ <-> alias * SourceSansPro-OsF/semibold/sc
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{LY1}{SourceSansPro-OsF}{b}{sl}{
- <-> ssub * SourceSansPro-OsF/b/it
+ <-> alias * SourceSansPro-OsF/bold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{b}{it}{
+ <-> alias * SourceSansPro-OsF/bold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{b}{n}{
+ <-> alias * SourceSansPro-OsF/bold/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{b}{sc}{
+ <-> alias * SourceSansPro-OsF/bold/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{el}{sl}{
- <-> ssub * SourceSansPro-OsF/el/it
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{eb}{it}{
+ <-> alias * SourceSansPro-OsF/black/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{bx}{sl}{
- <-> ssub * SourceSansPro-OsF/b/sl
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{eb}{sl}{
+ <-> alias * SourceSansPro-OsF/black/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-OsF}{bx}{n}{
- <-> ssub * SourceSansPro-OsF/b/n
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{eb}{sc}{
+ <-> alias * SourceSansPro-OsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{eb}{n}{
+ <-> alias * SourceSansPro-OsF/black/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-OsF}{bx}{sc}{
<-> ssub * SourceSansPro-OsF/b/sc
}{}
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{bx}{n}{
+ <-> ssub * SourceSansPro-OsF/b/n
+}{}
+
\DeclareFontShape{LY1}{SourceSansPro-OsF}{bx}{it}{
<-> ssub * SourceSansPro-OsF/b/it
}{}
+\DeclareFontShape{LY1}{SourceSansPro-OsF}{bx}{sl}{
+ <-> ssub * SourceSansPro-OsF/b/sl
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-Sup.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-Sup.fd
index c24ae17f8c..dc294f8e71 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-Sup.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-Sup.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-Sup.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,86 +19,197 @@
\DeclareFontFamily{LY1}{SourceSansPro-Sup}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{k}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{bold}{sl}{
+ <-> ssub * SourceSansPro-Sup/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-sup-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{k}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{black}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BlackIt-sup-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{k}{sl}{
- <-> ssub * SourceSansPro-Sup/k/it
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{black}{sl}{
+ <-> ssub * SourceSansPro-Sup/black/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-sup-ly1
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-sup-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{l}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Sup/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-sup-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{l}{sl}{
- <-> ssub * SourceSansPro-Sup/l/it
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-sup-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{light}{sl}{
+ <-> ssub * SourceSansPro-Sup/light/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{sb}{it}{
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-sup-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{sb}{sl}{
- <-> ssub * SourceSansPro-Sup/sb/it
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Sup/semibold/it
}{}
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-sup-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{regular}{sl}{
+ <-> ssub * SourceSansPro-Sup/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{LY1}{SourceSansPro-Sup}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-sup-ly1
+ <-> alias * SourceSansPro-Sup/extralight/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-Sup}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-sup-ly1
+ <-> alias * SourceSansPro-Sup/extralight/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-Sup}{el}{sl}{
- <-> ssub * SourceSansPro-Sup/el/it
+ <-> alias * SourceSansPro-Sup/extralight/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-sup-ly1
+
+% l --> light
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{l}{n}{
+ <-> alias * SourceSansPro-Sup/light/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-sup-ly1
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{l}{it}{
+ <-> alias * SourceSansPro-Sup/light/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{b}{sl}{
- <-> ssub * SourceSansPro-Sup/b/it
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{l}{sl}{
+ <-> alias * SourceSansPro-Sup/light/sl
}{}
+
+% m --> regular
+
\DeclareFontShape{LY1}{SourceSansPro-Sup}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-sup-ly1
+ <-> alias * SourceSansPro-Sup/regular/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{m}{sl}{
+ <-> alias * SourceSansPro-Sup/regular/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-Sup}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-sup-ly1
+ <-> alias * SourceSansPro-Sup/regular/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{m}{sl}{
- <-> ssub * SourceSansPro-Sup/m/it
+
+% sb --> semibold
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{sb}{sl}{
+ <-> alias * SourceSansPro-Sup/semibold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-Sup}{bx}{sl}{
- <-> ssub * SourceSansPro-Sup/b/sl
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{sb}{it}{
+ <-> alias * SourceSansPro-Sup/semibold/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{sb}{n}{
+ <-> alias * SourceSansPro-Sup/semibold/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{b}{n}{
+ <-> alias * SourceSansPro-Sup/bold/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{b}{it}{
+ <-> alias * SourceSansPro-Sup/bold/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{b}{sl}{
+ <-> alias * SourceSansPro-Sup/bold/sl
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{eb}{n}{
+ <-> alias * SourceSansPro-Sup/black/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{eb}{it}{
+ <-> alias * SourceSansPro-Sup/black/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{eb}{sl}{
+ <-> alias * SourceSansPro-Sup/black/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-Sup}{bx}{n}{
<-> ssub * SourceSansPro-Sup/b/n
}{}
+\DeclareFontShape{LY1}{SourceSansPro-Sup}{bx}{sl}{
+ <-> ssub * SourceSansPro-Sup/b/sl
+}{}
+
\DeclareFontShape{LY1}{SourceSansPro-Sup}{bx}{it}{
<-> ssub * SourceSansPro-Sup/b/it
}{}
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-TLF.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-TLF.fd
index a362bef701..77e7d31220 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-TLF.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-TLF.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-TLF.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,104 +19,235 @@
\DeclareFontFamily{LY1}{SourceSansPro-TLF}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-ly1
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{sc}{
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TLF/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{semibold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{sl}{
- <-> ssub * SourceSansPro-TLF/sb/it
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TLF/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-sc-ly1
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TLF/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tlf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-tlf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{sl}{
- <-> ssub * SourceSansPro-TLF/l/it
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{light}{sl}{
+ <-> ssub * SourceSansPro-TLF/light/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{k}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tlf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{k}{sc}{
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{black}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{black}{sl}{
+ <-> ssub * SourceSansPro-TLF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{k}{sl}{
- <-> ssub * SourceSansPro-TLF/k/it
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TLF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{sc}{
+ <-> alias * SourceSansPro-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{n}{
+ <-> alias * SourceSansPro-TLF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{it}{
+ <-> alias * SourceSansPro-TLF/extralight/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{sl}{
+ <-> alias * SourceSansPro-TLF/extralight/sl
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{sc}{
+ <-> alias * SourceSansPro-TLF/light/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{n}{
+ <-> alias * SourceSansPro-TLF/light/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{it}{
+ <-> alias * SourceSansPro-TLF/light/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{l}{sl}{
+ <-> alias * SourceSansPro-TLF/light/sl
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{m}{sl}{
+ <-> alias * SourceSansPro-TLF/regular/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-TLF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tlf-ly1
+ <-> alias * SourceSansPro-TLF/regular/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-TLF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-ly1
+ <-> alias * SourceSansPro-TLF/regular/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-TLF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-sc-ly1
+ <-> alias * SourceSansPro-TLF/regular/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{m}{sl}{
- <-> ssub * SourceSansPro-TLF/m/it
+
+% sb --> semibold
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{it}{
+ <-> alias * SourceSansPro-TLF/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{sl}{
+ <-> alias * SourceSansPro-TLF/semibold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{sc}{
+ <-> alias * SourceSansPro-TLF/semibold/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{sb}{n}{
+ <-> alias * SourceSansPro-TLF/semibold/n
}{}
+
+% b --> bold
+
\DeclareFontShape{LY1}{SourceSansPro-TLF}{b}{sl}{
- <-> ssub * SourceSansPro-TLF/b/it
+ <-> alias * SourceSansPro-TLF/bold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{b}{it}{
+ <-> alias * SourceSansPro-TLF/bold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{b}{n}{
+ <-> alias * SourceSansPro-TLF/bold/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{b}{sc}{
+ <-> alias * SourceSansPro-TLF/bold/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{el}{sl}{
- <-> ssub * SourceSansPro-TLF/el/it
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{eb}{sc}{
+ <-> alias * SourceSansPro-TLF/black/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TLF}{bx}{sl}{
- <-> ssub * SourceSansPro-TLF/b/sl
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{eb}{n}{
+ <-> alias * SourceSansPro-TLF/black/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{eb}{it}{
+ <-> alias * SourceSansPro-TLF/black/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{eb}{sl}{
+ <-> alias * SourceSansPro-TLF/black/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-TLF}{bx}{n}{
@@ -119,6 +258,10 @@
<-> ssub * SourceSansPro-TLF/b/sc
}{}
+\DeclareFontShape{LY1}{SourceSansPro-TLF}{bx}{sl}{
+ <-> ssub * SourceSansPro-TLF/b/sl
+}{}
+
\DeclareFontShape{LY1}{SourceSansPro-TLF}{bx}{it}{
<-> ssub * SourceSansPro-TLF/b/it
}{}
diff --git a/fonts/sourcesanspro/tex/LY1SourceSansPro-TOsF.fd b/fonts/sourcesanspro/tex/LY1SourceSansPro-TOsF.fd
index b0f715e5d6..7b0aedea84 100644
--- a/fonts/sourcesanspro/tex/LY1SourceSansPro-TOsF.fd
+++ b/fonts/sourcesanspro/tex/LY1SourceSansPro-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{LY1SourceSansPro-TOsF.fd}
- [2016/12/03 (autoinst) Font definitions for LY1/SourceSansPro-TOsF.]
+ [2020/01/19 (autoinst) Font definitions for LY1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,108 +19,235 @@
\DeclareFontFamily{LY1}{SourceSansPro-TOsF}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-ly1
+
+% ---- black ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{black}{sl}{
+ <-> ssub * SourceSansPro-TOsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/it
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{it}{
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/bold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{regular}{it}{
<-> \SourceSansPro@@scale SourceSansPro-It-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{sc}{
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{regular}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{regular}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{sl}{
- <-> ssub * SourceSansPro-TOsF/m/it
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TOsF/regular/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{it}{
+
+% ---- light ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-sc-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-ly1
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{light}{sl}{
+ <-> ssub * SourceSansPro-TOsF/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{n}{
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{sc}{
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{extralight}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{sl}{
- <-> ssub * SourceSansPro-TOsF/el/it
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TOsF/extralight/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-sc-ly1
+
+% ---- semibold ----
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-ly1
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{k}{sl}{
- <-> ssub * SourceSansPro-TOsF/k/it
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/semibold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{n}{
+ <-> alias * SourceSansPro-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{sc}{
+ <-> alias * SourceSansPro-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{sl}{
+ <-> alias * SourceSansPro-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{el}{it}{
+ <-> alias * SourceSansPro-TOsF/extralight/it
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{l}{sl}{
+ <-> alias * SourceSansPro-TOsF/light/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-TOsF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-ly1
+ <-> alias * SourceSansPro-TOsF/light/it
}{}
\DeclareFontShape{LY1}{SourceSansPro-TOsF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-ly1
+ <-> alias * SourceSansPro-TOsF/light/n
}{}
\DeclareFontShape{LY1}{SourceSansPro-TOsF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-sc-ly1
+ <-> alias * SourceSansPro-TOsF/light/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{l}{sl}{
- <-> ssub * SourceSansPro-TOsF/l/it
+
+% m --> regular
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{it}{
+ <-> alias * SourceSansPro-TOsF/regular/it
}{}
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{sl}{
+ <-> alias * SourceSansPro-TOsF/regular/sl
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{sc}{
+ <-> alias * SourceSansPro-TOsF/regular/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{m}{n}{
+ <-> alias * SourceSansPro-TOsF/regular/n
+}{}
+
+
+% sb --> semibold
+
\DeclareFontShape{LY1}{SourceSansPro-TOsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-ly1
+ <-> alias * SourceSansPro-TOsF/semibold/it
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-ly1
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{sb}{sl}{
+ <-> alias * SourceSansPro-TOsF/semibold/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-TOsF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-ly1
+ <-> alias * SourceSansPro-TOsF/semibold/sc
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{sb}{sl}{
- <-> ssub * SourceSansPro-TOsF/sb/it
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{sb}{n}{
+ <-> alias * SourceSansPro-TOsF/semibold/n
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bx}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/sl
+
+% b --> bold
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{sl}{
+ <-> alias * SourceSansPro-TOsF/bold/sl
}{}
-\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bx}{it}{
- <-> ssub * SourceSansPro-TOsF/b/it
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{it}{
+ <-> alias * SourceSansPro-TOsF/bold/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{n}{
+ <-> alias * SourceSansPro-TOsF/bold/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{b}{sc}{
+ <-> alias * SourceSansPro-TOsF/bold/sc
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{eb}{sc}{
+ <-> alias * SourceSansPro-TOsF/black/sc
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{eb}{n}{
+ <-> alias * SourceSansPro-TOsF/black/n
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{eb}{it}{
+ <-> alias * SourceSansPro-TOsF/black/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{eb}{sl}{
+ <-> alias * SourceSansPro-TOsF/black/sl
}{}
\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bx}{sc}{
@@ -123,4 +258,12 @@
<-> ssub * SourceSansPro-TOsF/b/n
}{}
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bx}{it}{
+ <-> ssub * SourceSansPro-TOsF/b/it
+}{}
+
+\DeclareFontShape{LY1}{SourceSansPro-TOsF}{bx}{sl}{
+ <-> ssub * SourceSansPro-TOsF/b/sl
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-Dnom.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-Dnom.fd
index 55005dcfb7..06192ecd23 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-Dnom.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-Dnom.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-Dnom.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-Dnom.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,86 +19,197 @@
\DeclareFontFamily{OT1}{SourceSansPro-Dnom}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{sb}{it}{
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{bold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{black}{sl}{
+ <-> ssub * SourceSansPro-Dnom/black/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-dnom-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{sb}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-dnom-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{sb}{sl}{
- <-> ssub * SourceSansPro-Dnom/sb/it
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/semibold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{l}{n}{
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-dnom-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{l}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-dnom-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{l}{sl}{
- <-> ssub * SourceSansPro-Dnom/l/it
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{light}{sl}{
+ <-> ssub * SourceSansPro-Dnom/light/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-dnom-ot1
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-dnom-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-dnom-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{k}{sl}{
- <-> ssub * SourceSansPro-Dnom/k/it
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Dnom/extralight/it
}{}
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-dnom-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{regular}{sl}{
+ <-> ssub * SourceSansPro-Dnom/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-dnom-ot1
+ <-> alias * SourceSansPro-Dnom/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{el}{sl}{
+ <-> alias * SourceSansPro-Dnom/extralight/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-dnom-ot1
+ <-> alias * SourceSansPro-Dnom/extralight/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{el}{sl}{
- <-> ssub * SourceSansPro-Dnom/el/it
+
+% l --> light
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{l}{sl}{
+ <-> alias * SourceSansPro-Dnom/light/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{l}{it}{
+ <-> alias * SourceSansPro-Dnom/light/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{l}{n}{
+ <-> alias * SourceSansPro-Dnom/light/n
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{m}{sl}{
+ <-> alias * SourceSansPro-Dnom/regular/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-dnom-ot1
+ <-> alias * SourceSansPro-Dnom/regular/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-ot1
+ <-> alias * SourceSansPro-Dnom/regular/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{m}{sl}{
- <-> ssub * SourceSansPro-Dnom/m/it
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{sb}{it}{
+ <-> alias * SourceSansPro-Dnom/semibold/it
}{}
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{sb}{sl}{
+ <-> alias * SourceSansPro-Dnom/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{sb}{n}{
+ <-> alias * SourceSansPro-Dnom/semibold/n
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-dnom-ot1
+ <-> alias * SourceSansPro-Dnom/bold/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{b}{sl}{
+ <-> alias * SourceSansPro-Dnom/bold/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-dnom-ot1
+ <-> alias * SourceSansPro-Dnom/bold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{b}{sl}{
- <-> ssub * SourceSansPro-Dnom/b/it
+
+% eb --> black
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{eb}{n}{
+ <-> alias * SourceSansPro-Dnom/black/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Dnom}{bx}{it}{
- <-> ssub * SourceSansPro-Dnom/b/it
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{eb}{sl}{
+ <-> alias * SourceSansPro-Dnom/black/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{eb}{it}{
+ <-> alias * SourceSansPro-Dnom/black/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{bx}{n}{
<-> ssub * SourceSansPro-Dnom/b/n
}{}
+\DeclareFontShape{OT1}{SourceSansPro-Dnom}{bx}{it}{
+ <-> ssub * SourceSansPro-Dnom/b/it
+}{}
+
\DeclareFontShape{OT1}{SourceSansPro-Dnom}{bx}{sl}{
<-> ssub * SourceSansPro-Dnom/b/sl
}{}
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-Inf.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-Inf.fd
index 2b656c7ff0..ac55909435 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-Inf.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-Inf.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-Inf.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-Inf.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,80 +19,187 @@
\DeclareFontFamily{OT1}{SourceSansPro-Inf}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{el}{it}{
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{black}{sl}{
+ <-> ssub * SourceSansPro-Inf/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{bold}{sl}{
+ <-> ssub * SourceSansPro-Inf/bold/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-inf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{el}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-inf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{el}{sl}{
- <-> ssub * SourceSansPro-Inf/el/it
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Inf/extralight/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-ot1
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-inf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{b}{sl}{
- <-> ssub * SourceSansPro-Inf/b/it
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{light}{sl}{
+ <-> ssub * SourceSansPro-Inf/light/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-inf-ot1
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-inf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{m}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-inf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Inf/semibold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{regular}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-inf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{m}{sl}{
- <-> ssub * SourceSansPro-Inf/m/it
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-inf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{regular}{sl}{
+ <-> ssub * SourceSansPro-Inf/regular/it
}{}
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{el}{it}{
+ <-> alias * SourceSansPro-Inf/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{el}{sl}{
+ <-> alias * SourceSansPro-Inf/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{el}{n}{
+ <-> alias * SourceSansPro-Inf/extralight/n
+}{}
+
+
+% l --> light
+
\DeclareFontShape{OT1}{SourceSansPro-Inf}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-inf-ot1
+ <-> alias * SourceSansPro-Inf/light/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{l}{it}{
+ <-> alias * SourceSansPro-Inf/light/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-Inf}{l}{sl}{
- <-> ssub * SourceSansPro-Inf/l/it
+ <-> alias * SourceSansPro-Inf/light/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-inf-ot1
+
+% m --> regular
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{m}{it}{
+ <-> alias * SourceSansPro-Inf/regular/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{m}{sl}{
+ <-> alias * SourceSansPro-Inf/regular/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{k}{sl}{
- <-> ssub * SourceSansPro-Inf/k/it
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{m}{n}{
+ <-> alias * SourceSansPro-Inf/regular/n
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{sb}{sl}{
+ <-> alias * SourceSansPro-Inf/semibold/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-Inf}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-inf-ot1
+ <-> alias * SourceSansPro-Inf/semibold/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-Inf}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-inf-ot1
+ <-> alias * SourceSansPro-Inf/semibold/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{sb}{sl}{
- <-> ssub * SourceSansPro-Inf/sb/it
+
+% b --> bold
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{b}{sl}{
+ <-> alias * SourceSansPro-Inf/bold/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Inf}{bx}{sl}{
- <-> ssub * SourceSansPro-Inf/b/sl
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{b}{it}{
+ <-> alias * SourceSansPro-Inf/bold/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{b}{n}{
+ <-> alias * SourceSansPro-Inf/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{eb}{n}{
+ <-> alias * SourceSansPro-Inf/black/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{eb}{it}{
+ <-> alias * SourceSansPro-Inf/black/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{eb}{sl}{
+ <-> alias * SourceSansPro-Inf/black/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-Inf}{bx}{n}{
@@ -95,4 +210,8 @@
<-> ssub * SourceSansPro-Inf/b/it
}{}
+\DeclareFontShape{OT1}{SourceSansPro-Inf}{bx}{sl}{
+ <-> ssub * SourceSansPro-Inf/b/sl
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-LF.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-LF.fd
index 05c08ecae0..7135ffb8ed 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-LF.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-LF.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-LF.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,116 +19,251 @@
\DeclareFontFamily{OT1}{SourceSansPro-LF}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-ot1
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-LF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-sc-ot1
+\DeclareFontShape{OT1}{SourceSansPro-LF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-lf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{sl}{
- <-> ssub * SourceSansPro-LF/sb/it
+\DeclareFontShape{OT1}{SourceSansPro-LF}{black}{sl}{
+ <-> ssub * SourceSansPro-LF/black/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-lf-ot1
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-lf-sc-ot1
+\DeclareFontShape{OT1}{SourceSansPro-LF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-LF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{k}{sl}{
- <-> ssub * SourceSansPro-LF/k/it
+\DeclareFontShape{OT1}{SourceSansPro-LF}{bold}{sl}{
+ <-> ssub * SourceSansPro-LF/bold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-ot1
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-lf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{sc}{
+\DeclareFontShape{OT1}{SourceSansPro-LF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{regular}{sl}{
+ <-> ssub * SourceSansPro-LF/regular/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{light}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Light-lf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-LF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-lf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{sl}{
- <-> ssub * SourceSansPro-LF/l/it
+\DeclareFontShape{OT1}{SourceSansPro-LF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-LF}{light}{sl}{
+ <-> ssub * SourceSansPro-LF/light/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{el}{n}{
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-ot1
}{}
+\DeclareFontShape{OT1}{SourceSansPro-LF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-LF/extralight/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-LF/semibold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{OT1}{SourceSansPro-LF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-sc-ot1
+ <-> alias * SourceSansPro-LF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{el}{n}{
+ <-> alias * SourceSansPro-LF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{el}{it}{
+ <-> alias * SourceSansPro-LF/extralight/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-LF}{el}{sl}{
- <-> ssub * SourceSansPro-LF/el/it
+ <-> alias * SourceSansPro-LF/extralight/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-lf-ot1
+
+% l --> light
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{it}{
+ <-> alias * SourceSansPro-LF/light/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-ot1
+\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{sl}{
+ <-> alias * SourceSansPro-LF/light/sl
}{}
+\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{sc}{
+ <-> alias * SourceSansPro-LF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{l}{n}{
+ <-> alias * SourceSansPro-LF/light/n
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{OT1}{SourceSansPro-LF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-ot1
+ <-> alias * SourceSansPro-LF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{m}{sc}{
+ <-> alias * SourceSansPro-LF/regular/sc
}{}
\DeclareFontShape{OT1}{SourceSansPro-LF}{m}{sl}{
- <-> ssub * SourceSansPro-LF/m/it
+ <-> alias * SourceSansPro-LF/regular/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-LF}{m}{it}{
+ <-> alias * SourceSansPro-LF/regular/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-sc-ot1
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{sl}{
+ <-> alias * SourceSansPro-LF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{it}{
+ <-> alias * SourceSansPro-LF/semibold/it
}{}
+\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{n}{
+ <-> alias * SourceSansPro-LF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{sb}{sc}{
+ <-> alias * SourceSansPro-LF/semibold/sc
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{OT1}{SourceSansPro-LF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-ot1
+ <-> alias * SourceSansPro-LF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{b}{sc}{
+ <-> alias * SourceSansPro-LF/bold/sc
}{}
\DeclareFontShape{OT1}{SourceSansPro-LF}{b}{sl}{
- <-> ssub * SourceSansPro-LF/b/it
+ <-> alias * SourceSansPro-LF/bold/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{bx}{sc}{
- <-> ssub * SourceSansPro-LF/b/sc
+\DeclareFontShape{OT1}{SourceSansPro-LF}{b}{it}{
+ <-> alias * SourceSansPro-LF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{eb}{n}{
+ <-> alias * SourceSansPro-LF/black/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{eb}{sc}{
+ <-> alias * SourceSansPro-LF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{eb}{sl}{
+ <-> alias * SourceSansPro-LF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-LF}{eb}{it}{
+ <-> alias * SourceSansPro-LF/black/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-LF}{bx}{n}{
<-> ssub * SourceSansPro-LF/b/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-LF}{bx}{it}{
- <-> ssub * SourceSansPro-LF/b/it
+\DeclareFontShape{OT1}{SourceSansPro-LF}{bx}{sc}{
+ <-> ssub * SourceSansPro-LF/b/sc
}{}
\DeclareFontShape{OT1}{SourceSansPro-LF}{bx}{sl}{
<-> ssub * SourceSansPro-LF/b/sl
}{}
+\DeclareFontShape{OT1}{SourceSansPro-LF}{bx}{it}{
+ <-> ssub * SourceSansPro-LF/b/it
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-Numr.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-Numr.fd
index 26b9897f0d..b372bf5d12 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-Numr.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-Numr.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-Numr.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-Numr.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,88 +19,199 @@
\DeclareFontFamily{OT1}{SourceSansPro-Numr}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-numr-ot1
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-numr-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{sb}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{regular}{sl}{
+ <-> ssub * SourceSansPro-Numr/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-numr-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{sb}{sl}{
- <-> ssub * SourceSansPro-Numr/sb/it
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-numr-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-numr-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Numr/semibold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{l}{it}{
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Numr/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-numr-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{l}{sl}{
- <-> ssub * SourceSansPro-Numr/l/it
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-numr-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{k}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{light}{sl}{
+ <-> ssub * SourceSansPro-Numr/light/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-numr-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{bold}{sl}{
+ <-> ssub * SourceSansPro-Numr/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-numr-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{k}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{black}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BlackIt-numr-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{k}{sl}{
- <-> ssub * SourceSansPro-Numr/k/it
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{black}{sl}{
+ <-> ssub * SourceSansPro-Numr/black/it
}{}
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{OT1}{SourceSansPro-Numr}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-ot1
+ <-> alias * SourceSansPro-Numr/extralight/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-Numr}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-ot1
+ <-> alias * SourceSansPro-Numr/extralight/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-Numr}{el}{sl}{
- <-> ssub * SourceSansPro-Numr/el/it
+ <-> alias * SourceSansPro-Numr/extralight/sl
}{}
+
+% l --> light
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{l}{n}{
+ <-> alias * SourceSansPro-Numr/light/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{l}{it}{
+ <-> alias * SourceSansPro-Numr/light/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{l}{sl}{
+ <-> alias * SourceSansPro-Numr/light/sl
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{OT1}{SourceSansPro-Numr}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-numr-ot1
+ <-> alias * SourceSansPro-Numr/regular/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-Numr}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-numr-ot1
+ <-> alias * SourceSansPro-Numr/regular/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-Numr}{m}{sl}{
- <-> ssub * SourceSansPro-Numr/m/it
+ <-> alias * SourceSansPro-Numr/regular/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-numr-ot1
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{sb}{n}{
+ <-> alias * SourceSansPro-Numr/semibold/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{sb}{it}{
+ <-> alias * SourceSansPro-Numr/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{sb}{sl}{
+ <-> alias * SourceSansPro-Numr/semibold/sl
}{}
+
+% b --> bold
+
\DeclareFontShape{OT1}{SourceSansPro-Numr}{b}{sl}{
- <-> ssub * SourceSansPro-Numr/b/it
+ <-> alias * SourceSansPro-Numr/bold/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{bx}{sl}{
- <-> ssub * SourceSansPro-Numr/b/sl
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{b}{it}{
+ <-> alias * SourceSansPro-Numr/bold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Numr}{bx}{n}{
- <-> ssub * SourceSansPro-Numr/b/n
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{b}{n}{
+ <-> alias * SourceSansPro-Numr/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{eb}{it}{
+ <-> alias * SourceSansPro-Numr/black/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{eb}{sl}{
+ <-> alias * SourceSansPro-Numr/black/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{eb}{n}{
+ <-> alias * SourceSansPro-Numr/black/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{bx}{sl}{
+ <-> ssub * SourceSansPro-Numr/b/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-Numr}{bx}{it}{
<-> ssub * SourceSansPro-Numr/b/it
}{}
+\DeclareFontShape{OT1}{SourceSansPro-Numr}{bx}{n}{
+ <-> ssub * SourceSansPro-Numr/b/n
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-OsF.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-OsF.fd
index 383093eff0..0c7818932c 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-OsF.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-OsF.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-OsF.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-OsF.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,106 +19,245 @@
\DeclareFontFamily{OT1}{SourceSansPro-OsF}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-ot1
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{sc}{
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{black}{sl}{
+ <-> ssub * SourceSansPro-OsF/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{bold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-osf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{sl}{
- <-> ssub * SourceSansPro-OsF/b/it
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-ot1
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-OsF/bold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-ot1
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-osf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{sl}{
- <-> ssub * SourceSansPro-OsF/m/it
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{el}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-OsF/semibold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{light}{sl}{
+ <-> ssub * SourceSansPro-OsF/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{el}{sc}{
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{extralight}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{el}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-ot1
}{}
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-OsF/extralight/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-osf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-OsF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{el}{it}{
+ <-> alias * SourceSansPro-OsF/extralight/it
+}{}
+
\DeclareFontShape{OT1}{SourceSansPro-OsF}{el}{sl}{
- <-> ssub * SourceSansPro-OsF/el/it
+ <-> alias * SourceSansPro-OsF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{el}{sc}{
+ <-> alias * SourceSansPro-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{el}{n}{
+ <-> alias * SourceSansPro-OsF/extralight/n
}{}
+
+% l --> light
+
\DeclareFontShape{OT1}{SourceSansPro-OsF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-osf-ot1
+ <-> alias * SourceSansPro-OsF/light/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-OsF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-osf-sc-ot1
+ <-> alias * SourceSansPro-OsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{l}{sl}{
+ <-> alias * SourceSansPro-OsF/light/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-OsF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-ot1
+ <-> alias * SourceSansPro-OsF/light/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{l}{sl}{
- <-> ssub * SourceSansPro-OsF/l/it
+
+% m --> regular
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{sl}{
+ <-> alias * SourceSansPro-OsF/regular/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-osf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{it}{
+ <-> alias * SourceSansPro-OsF/regular/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-osf-sc-ot1
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{n}{
+ <-> alias * SourceSansPro-OsF/regular/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{m}{sc}{
+ <-> alias * SourceSansPro-OsF/regular/sc
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{sb}{n}{
+ <-> alias * SourceSansPro-OsF/semibold/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{k}{sl}{
- <-> ssub * SourceSansPro-OsF/k/it
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{sb}{sc}{
+ <-> alias * SourceSansPro-OsF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{sb}{sl}{
+ <-> alias * SourceSansPro-OsF/semibold/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-OsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-ot1
+ <-> alias * SourceSansPro-OsF/semibold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-sc-ot1
+
+% b --> bold
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{n}{
+ <-> alias * SourceSansPro-OsF/bold/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{sc}{
+ <-> alias * SourceSansPro-OsF/bold/sc
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{sb}{sl}{
- <-> ssub * SourceSansPro-OsF/sb/it
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{sl}{
+ <-> alias * SourceSansPro-OsF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{b}{it}{
+ <-> alias * SourceSansPro-OsF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{eb}{n}{
+ <-> alias * SourceSansPro-OsF/black/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{eb}{sc}{
+ <-> alias * SourceSansPro-OsF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{eb}{sl}{
+ <-> alias * SourceSansPro-OsF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{eb}{it}{
+ <-> alias * SourceSansPro-OsF/black/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-OsF}{bx}{sl}{
<-> ssub * SourceSansPro-OsF/b/sl
}{}
+\DeclareFontShape{OT1}{SourceSansPro-OsF}{bx}{it}{
+ <-> ssub * SourceSansPro-OsF/b/it
+}{}
+
\DeclareFontShape{OT1}{SourceSansPro-OsF}{bx}{n}{
<-> ssub * SourceSansPro-OsF/b/n
}{}
@@ -119,8 +266,4 @@
<-> ssub * SourceSansPro-OsF/b/sc
}{}
-\DeclareFontShape{OT1}{SourceSansPro-OsF}{bx}{it}{
- <-> ssub * SourceSansPro-OsF/b/it
-}{}
-
\endinput
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-Sup.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-Sup.fd
index 09b31be069..ce77500568 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-Sup.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-Sup.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-Sup.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,88 +19,199 @@
\DeclareFontFamily{OT1}{SourceSansPro-Sup}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-sup-ot1
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-sup-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{el}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{black}{sl}{
+ <-> ssub * SourceSansPro-Sup/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{bold}{sl}{
+ <-> ssub * SourceSansPro-Sup/bold/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Sup/semibold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-sup-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{light}{sl}{
+ <-> ssub * SourceSansPro-Sup/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-sup-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{el}{sl}{
- <-> ssub * SourceSansPro-Sup/el/it
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-sup-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{m}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Sup/extralight/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{regular}{it}{
<-> \SourceSansPro@@scale SourceSansPro-It-sup-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{m}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{regular}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-sup-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{m}{sl}{
- <-> ssub * SourceSansPro-Sup/m/it
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{regular}{sl}{
+ <-> ssub * SourceSansPro-Sup/regular/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-sup-ot1
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{el}{n}{
+ <-> alias * SourceSansPro-Sup/extralight/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-sup-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{el}{sl}{
+ <-> alias * SourceSansPro-Sup/extralight/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{b}{sl}{
- <-> ssub * SourceSansPro-Sup/b/it
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{el}{it}{
+ <-> alias * SourceSansPro-Sup/extralight/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-sup-ot1
+
+% l --> light
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{l}{n}{
+ <-> alias * SourceSansPro-Sup/light/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{l}{sl}{
+ <-> alias * SourceSansPro-Sup/light/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{l}{it}{
+ <-> alias * SourceSansPro-Sup/light/it
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{m}{n}{
+ <-> alias * SourceSansPro-Sup/regular/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{m}{sl}{
+ <-> alias * SourceSansPro-Sup/regular/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{m}{it}{
+ <-> alias * SourceSansPro-Sup/regular/it
}{}
+
+% sb --> semibold
+
\DeclareFontShape{OT1}{SourceSansPro-Sup}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-ot1
+ <-> alias * SourceSansPro-Sup/semibold/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-Sup}{sb}{sl}{
- <-> ssub * SourceSansPro-Sup/sb/it
+ <-> alias * SourceSansPro-Sup/semibold/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-sup-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{sb}{it}{
+ <-> alias * SourceSansPro-Sup/semibold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-sup-ot1
+
+% b --> bold
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{b}{n}{
+ <-> alias * SourceSansPro-Sup/bold/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{l}{sl}{
- <-> ssub * SourceSansPro-Sup/l/it
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{b}{sl}{
+ <-> alias * SourceSansPro-Sup/bold/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-sup-ot1
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{b}{it}{
+ <-> alias * SourceSansPro-Sup/bold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-sup-ot1
+
+% eb --> black
+
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{eb}{n}{
+ <-> alias * SourceSansPro-Sup/black/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{k}{sl}{
- <-> ssub * SourceSansPro-Sup/k/it
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{eb}{sl}{
+ <-> alias * SourceSansPro-Sup/black/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{bx}{n}{
- <-> ssub * SourceSansPro-Sup/b/n
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{eb}{it}{
+ <-> alias * SourceSansPro-Sup/black/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-Sup}{bx}{it}{
- <-> ssub * SourceSansPro-Sup/b/it
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{bx}{n}{
+ <-> ssub * SourceSansPro-Sup/b/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-Sup}{bx}{sl}{
<-> ssub * SourceSansPro-Sup/b/sl
}{}
+\DeclareFontShape{OT1}{SourceSansPro-Sup}{bx}{it}{
+ <-> ssub * SourceSansPro-Sup/b/it
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-TLF.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-TLF.fd
index 53b9605030..8963322472 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-TLF.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-TLF.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-TLF.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,110 +19,245 @@
\DeclareFontFamily{OT1}{SourceSansPro-TLF}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-sc-ot1
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{sl}{
- <-> ssub * SourceSansPro-TLF/el/it
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TLF/bold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-sc-ot1
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tlf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{sl}{
- <-> ssub * SourceSansPro-TLF/m/it
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{black}{sl}{
+ <-> ssub * SourceSansPro-TLF/black/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-ot1
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{sl}{
- <-> ssub * SourceSansPro-TLF/b/it
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TLF/extralight/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{sc}{
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-tlf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{light}{sl}{
+ <-> ssub * SourceSansPro-TLF/light/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{semibold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{sl}{
- <-> ssub * SourceSansPro-TLF/sb/it
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TLF/semibold/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-ot1
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-sc-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{k}{sl}{
- <-> ssub * SourceSansPro-TLF/k/it
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TLF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{it}{
+ <-> alias * SourceSansPro-TLF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{sl}{
+ <-> alias * SourceSansPro-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{sc}{
+ <-> alias * SourceSansPro-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{el}{n}{
+ <-> alias * SourceSansPro-TLF/extralight/n
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{l}{sl}{
+ <-> alias * SourceSansPro-TLF/light/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-TLF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-tlf-ot1
+ <-> alias * SourceSansPro-TLF/light/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-TLF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-ot1
+ <-> alias * SourceSansPro-TLF/light/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-TLF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-sc-ot1
+ <-> alias * SourceSansPro-TLF/light/sc
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{l}{sl}{
- <-> ssub * SourceSansPro-TLF/l/it
+
+% m --> regular
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{sc}{
+ <-> alias * SourceSansPro-TLF/regular/sc
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TLF}{bx}{n}{
- <-> ssub * SourceSansPro-TLF/b/n
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{n}{
+ <-> alias * SourceSansPro-TLF/regular/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{it}{
+ <-> alias * SourceSansPro-TLF/regular/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{m}{sl}{
+ <-> alias * SourceSansPro-TLF/regular/sl
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{it}{
+ <-> alias * SourceSansPro-TLF/semibold/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{sl}{
+ <-> alias * SourceSansPro-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{sc}{
+ <-> alias * SourceSansPro-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{sb}{n}{
+ <-> alias * SourceSansPro-TLF/semibold/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{n}{
+ <-> alias * SourceSansPro-TLF/bold/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{sc}{
+ <-> alias * SourceSansPro-TLF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{sl}{
+ <-> alias * SourceSansPro-TLF/bold/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{b}{it}{
+ <-> alias * SourceSansPro-TLF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{eb}{n}{
+ <-> alias * SourceSansPro-TLF/black/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{eb}{sc}{
+ <-> alias * SourceSansPro-TLF/black/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{eb}{sl}{
+ <-> alias * SourceSansPro-TLF/black/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{eb}{it}{
+ <-> alias * SourceSansPro-TLF/black/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-TLF}{bx}{sc}{
<-> ssub * SourceSansPro-TLF/b/sc
}{}
+\DeclareFontShape{OT1}{SourceSansPro-TLF}{bx}{n}{
+ <-> ssub * SourceSansPro-TLF/b/n
+}{}
+
\DeclareFontShape{OT1}{SourceSansPro-TLF}{bx}{it}{
<-> ssub * SourceSansPro-TLF/b/it
}{}
diff --git a/fonts/sourcesanspro/tex/OT1SourceSansPro-TOsF.fd b/fonts/sourcesanspro/tex/OT1SourceSansPro-TOsF.fd
index 303e027474..97be2e4993 100644
--- a/fonts/sourcesanspro/tex/OT1SourceSansPro-TOsF.fd
+++ b/fonts/sourcesanspro/tex/OT1SourceSansPro-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{OT1SourceSansPro-TOsF.fd}
- [2016/12/03 (autoinst) Font definitions for OT1/SourceSansPro-TOsF.]
+ [2020/01/19 (autoinst) Font definitions for OT1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,116 +19,251 @@
\DeclareFontFamily{OT1}{SourceSansPro-TOsF}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-ot1
+
+% ---- regular ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tosf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{sl}{
- <-> ssub * SourceSansPro-TOsF/sb/it
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TOsF/regular/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{it}{
+
+% ---- light ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tosf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{sc}{
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{light}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{sl}{
- <-> ssub * SourceSansPro-TOsF/l/it
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{light}{sl}{
+ <-> ssub * SourceSansPro-TOsF/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{k}{it}{
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TOsF/extralight/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/semibold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{black}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{k}{sc}{
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{black}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tosf-sc-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{k}{n}{
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tosf-ot1
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{k}{sl}{
- <-> ssub * SourceSansPro-TOsF/k/it
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{black}{sl}{
+ <-> ssub * SourceSansPro-TOsF/black/it
}{}
+
+% ---- bold ----
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-ot1
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{sl}{
+ <-> alias * SourceSansPro-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{it}{
+ <-> alias * SourceSansPro-TOsF/extralight/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{n}{
+ <-> alias * SourceSansPro-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{sc}{
+ <-> alias * SourceSansPro-TOsF/extralight/sc
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{sc}{
+ <-> alias * SourceSansPro-TOsF/light/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{n}{
+ <-> alias * SourceSansPro-TOsF/light/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{it}{
+ <-> alias * SourceSansPro-TOsF/light/it
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{l}{sl}{
+ <-> alias * SourceSansPro-TOsF/light/sl
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{OT1}{SourceSansPro-TOsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tosf-ot1
+ <-> alias * SourceSansPro-TOsF/regular/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{m}{sl}{
+ <-> alias * SourceSansPro-TOsF/regular/sl
}{}
\DeclareFontShape{OT1}{SourceSansPro-TOsF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-sc-ot1
+ <-> alias * SourceSansPro-TOsF/regular/sc
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{m}{sl}{
- <-> ssub * SourceSansPro-TOsF/m/it
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{m}{n}{
+ <-> alias * SourceSansPro-TOsF/regular/n
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-ot1
+
+% sb --> semibold
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{n}{
+ <-> alias * SourceSansPro-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{sc}{
+ <-> alias * SourceSansPro-TOsF/semibold/sc
}{}
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{sl}{
+ <-> alias * SourceSansPro-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{sb}{it}{
+ <-> alias * SourceSansPro-TOsF/semibold/it
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{OT1}{SourceSansPro-TOsF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-ot1
+ <-> alias * SourceSansPro-TOsF/bold/sc
+}{}
+
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{b}{n}{
+ <-> alias * SourceSansPro-TOsF/bold/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-TOsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-ot1
+ <-> alias * SourceSansPro-TOsF/bold/it
}{}
\DeclareFontShape{OT1}{SourceSansPro-TOsF}{b}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/it
+ <-> alias * SourceSansPro-TOsF/bold/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-ot1
-}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-sc-ot1
-}{}
+% eb --> black
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-ot1
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{eb}{it}{
+ <-> alias * SourceSansPro-TOsF/black/it
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{el}{sl}{
- <-> ssub * SourceSansPro-TOsF/el/it
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{eb}{sl}{
+ <-> alias * SourceSansPro-TOsF/black/sl
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bx}{it}{
- <-> ssub * SourceSansPro-TOsF/b/it
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{eb}{sc}{
+ <-> alias * SourceSansPro-TOsF/black/sc
}{}
-\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bx}{sc}{
- <-> ssub * SourceSansPro-TOsF/b/sc
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{eb}{n}{
+ <-> alias * SourceSansPro-TOsF/black/n
}{}
\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bx}{n}{
<-> ssub * SourceSansPro-TOsF/b/n
}{}
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bx}{sc}{
+ <-> ssub * SourceSansPro-TOsF/b/sc
+}{}
+
\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bx}{sl}{
<-> ssub * SourceSansPro-TOsF/b/sl
}{}
+\DeclareFontShape{OT1}{SourceSansPro-TOsF}{bx}{it}{
+ <-> ssub * SourceSansPro-TOsF/b/it
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-Dnom.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-Dnom.fd
index 8256bbe3aa..df3efb2250 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-Dnom.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-Dnom.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-Dnom.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-Dnom.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-Dnom.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,88 +19,199 @@
\DeclareFontFamily{T1}{SourceSansPro-Dnom}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{l}{n}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{regular}{sl}{
+ <-> ssub * SourceSansPro-Dnom/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/semibold/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-dnom-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Dnom/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-dnom-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{l}{it}{
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-dnom-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{l}{sl}{
- <-> ssub * SourceSansPro-Dnom/l/it
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{light}{sl}{
+ <-> ssub * SourceSansPro-Dnom/light/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-dnom-t1
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-dnom-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-t1
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-dnom-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{k}{sl}{
- <-> ssub * SourceSansPro-Dnom/k/it
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{bold}{sl}{
+ <-> ssub * SourceSansPro-Dnom/bold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-dnom-t1
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-dnom-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-dnom-t1
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-dnom-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{sb}{sl}{
- <-> ssub * SourceSansPro-Dnom/sb/it
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{black}{sl}{
+ <-> ssub * SourceSansPro-Dnom/black/it
}{}
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{T1}{SourceSansPro-Dnom}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-dnom-t1
+ <-> alias * SourceSansPro-Dnom/extralight/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{el}{sl}{
+ <-> alias * SourceSansPro-Dnom/extralight/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-Dnom}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-dnom-t1
+ <-> alias * SourceSansPro-Dnom/extralight/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{el}{sl}{
- <-> ssub * SourceSansPro-Dnom/el/it
+
+% l --> light
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{l}{it}{
+ <-> alias * SourceSansPro-Dnom/light/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-dnom-t1
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{l}{sl}{
+ <-> alias * SourceSansPro-Dnom/light/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-dnom-t1
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{l}{n}{
+ <-> alias * SourceSansPro-Dnom/light/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{b}{sl}{
- <-> ssub * SourceSansPro-Dnom/b/it
+
+% m --> regular
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{m}{sl}{
+ <-> alias * SourceSansPro-Dnom/regular/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-Dnom}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-dnom-t1
+ <-> alias * SourceSansPro-Dnom/regular/it
}{}
\DeclareFontShape{T1}{SourceSansPro-Dnom}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-dnom-t1
+ <-> alias * SourceSansPro-Dnom/regular/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{m}{sl}{
- <-> ssub * SourceSansPro-Dnom/m/it
+
+% sb --> semibold
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{sb}{n}{
+ <-> alias * SourceSansPro-Dnom/semibold/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{bx}{sl}{
- <-> ssub * SourceSansPro-Dnom/b/sl
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{sb}{sl}{
+ <-> alias * SourceSansPro-Dnom/semibold/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-Dnom}{bx}{n}{
- <-> ssub * SourceSansPro-Dnom/b/n
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{sb}{it}{
+ <-> alias * SourceSansPro-Dnom/semibold/it
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{b}{sl}{
+ <-> alias * SourceSansPro-Dnom/bold/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{b}{it}{
+ <-> alias * SourceSansPro-Dnom/bold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{b}{n}{
+ <-> alias * SourceSansPro-Dnom/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{eb}{it}{
+ <-> alias * SourceSansPro-Dnom/black/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{eb}{sl}{
+ <-> alias * SourceSansPro-Dnom/black/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{eb}{n}{
+ <-> alias * SourceSansPro-Dnom/black/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{bx}{sl}{
+ <-> ssub * SourceSansPro-Dnom/b/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-Dnom}{bx}{it}{
<-> ssub * SourceSansPro-Dnom/b/it
}{}
+\DeclareFontShape{T1}{SourceSansPro-Dnom}{bx}{n}{
+ <-> ssub * SourceSansPro-Dnom/b/n
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-Inf.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-Inf.fd
index 4024f4a215..2a38fa29bc 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-Inf.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-Inf.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-Inf.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-Inf.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-Inf.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,76 +19,187 @@
\DeclareFontFamily{T1}{SourceSansPro-Inf}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-inf-t1
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-inf-t1
+\DeclareFontShape{T1}{SourceSansPro-Inf}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{el}{sl}{
- <-> ssub * SourceSansPro-Inf/el/it
+\DeclareFontShape{T1}{SourceSansPro-Inf}{bold}{sl}{
+ <-> ssub * SourceSansPro-Inf/bold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-inf-t1
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-inf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-inf-t1
+\DeclareFontShape{T1}{SourceSansPro-Inf}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{b}{sl}{
- <-> ssub * SourceSansPro-Inf/b/it
+\DeclareFontShape{T1}{SourceSansPro-Inf}{black}{sl}{
+ <-> ssub * SourceSansPro-Inf/black/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{m}{it}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{regular}{it}{
<-> \SourceSansPro@@scale SourceSansPro-It-inf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{m}{n}{
+\DeclareFontShape{T1}{SourceSansPro-Inf}{regular}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-inf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{m}{sl}{
- <-> ssub * SourceSansPro-Inf/m/it
+\DeclareFontShape{T1}{SourceSansPro-Inf}{regular}{sl}{
+ <-> ssub * SourceSansPro-Inf/regular/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-t1
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-inf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{l}{n}{
+\DeclareFontShape{T1}{SourceSansPro-Inf}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-inf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Inf/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-inf-t1
}{}
+\DeclareFontShape{T1}{SourceSansPro-Inf}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-inf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{light}{sl}{
+ <-> ssub * SourceSansPro-Inf/light/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-inf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-inf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Inf/semibold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{el}{n}{
+ <-> alias * SourceSansPro-Inf/extralight/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{el}{it}{
+ <-> alias * SourceSansPro-Inf/extralight/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{el}{sl}{
+ <-> alias * SourceSansPro-Inf/extralight/sl
+}{}
+
+
+% l --> light
+
\DeclareFontShape{T1}{SourceSansPro-Inf}{l}{sl}{
- <-> ssub * SourceSansPro-Inf/l/it
+ <-> alias * SourceSansPro-Inf/light/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-inf-t1
+\DeclareFontShape{T1}{SourceSansPro-Inf}{l}{it}{
+ <-> alias * SourceSansPro-Inf/light/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-inf-t1
+\DeclareFontShape{T1}{SourceSansPro-Inf}{l}{n}{
+ <-> alias * SourceSansPro-Inf/light/n
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{m}{n}{
+ <-> alias * SourceSansPro-Inf/regular/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{m}{it}{
+ <-> alias * SourceSansPro-Inf/regular/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{k}{sl}{
- <-> ssub * SourceSansPro-Inf/k/it
+\DeclareFontShape{T1}{SourceSansPro-Inf}{m}{sl}{
+ <-> alias * SourceSansPro-Inf/regular/sl
}{}
+
+% sb --> semibold
+
\DeclareFontShape{T1}{SourceSansPro-Inf}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-inf-t1
+ <-> alias * SourceSansPro-Inf/semibold/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{sb}{sl}{
+ <-> alias * SourceSansPro-Inf/semibold/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-Inf}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-inf-t1
+ <-> alias * SourceSansPro-Inf/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Inf}{sb}{sl}{
- <-> ssub * SourceSansPro-Inf/sb/it
+
+% b --> bold
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{b}{sl}{
+ <-> alias * SourceSansPro-Inf/bold/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{b}{it}{
+ <-> alias * SourceSansPro-Inf/bold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{b}{n}{
+ <-> alias * SourceSansPro-Inf/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{eb}{it}{
+ <-> alias * SourceSansPro-Inf/black/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{eb}{sl}{
+ <-> alias * SourceSansPro-Inf/black/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Inf}{eb}{n}{
+ <-> alias * SourceSansPro-Inf/black/n
}{}
\DeclareFontShape{T1}{SourceSansPro-Inf}{bx}{sl}{
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-LF.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-LF.fd
index 338d407051..0049b695ab 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-LF.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-LF.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-LF.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,99 +19,238 @@
\DeclareFontFamily{T1}{SourceSansPro-LF}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{sc}{
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-LF/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-lf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{light}{sl}{
+ <-> ssub * SourceSansPro-LF/light/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{semibold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{n}{
+\DeclareFontShape{T1}{SourceSansPro-LF}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-t1
+\DeclareFontShape{T1}{SourceSansPro-LF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-LF/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{sl}{
- <-> ssub * SourceSansPro-LF/sb/it
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-lf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-t1
+\DeclareFontShape{T1}{SourceSansPro-LF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-lf-t1
+\DeclareFontShape{T1}{SourceSansPro-LF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-lf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-LF}{regular}{sl}{
+ <-> ssub * SourceSansPro-LF/regular/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{l}{sl}{
- <-> ssub * SourceSansPro-LF/l/it
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{k}{n}{
+\DeclareFontShape{T1}{SourceSansPro-LF}{bold}{sl}{
+ <-> ssub * SourceSansPro-LF/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-lf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{k}{sc}{
+\DeclareFontShape{T1}{SourceSansPro-LF}{black}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Black-lf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{k}{it}{
+\DeclareFontShape{T1}{SourceSansPro-LF}{black}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{k}{sl}{
- <-> ssub * SourceSansPro-LF/k/it
+\DeclareFontShape{T1}{SourceSansPro-LF}{black}{sl}{
+ <-> ssub * SourceSansPro-LF/black/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{el}{it}{
+ <-> alias * SourceSansPro-LF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{el}{sl}{
+ <-> alias * SourceSansPro-LF/extralight/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-sc-t1
+ <-> alias * SourceSansPro-LF/extralight/sc
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-t1
+ <-> alias * SourceSansPro-LF/extralight/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-t1
+
+% l --> light
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{l}{sc}{
+ <-> alias * SourceSansPro-LF/light/sc
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{el}{sl}{
- <-> ssub * SourceSansPro-LF/el/it
+\DeclareFontShape{T1}{SourceSansPro-LF}{l}{n}{
+ <-> alias * SourceSansPro-LF/light/n
}{}
+\DeclareFontShape{T1}{SourceSansPro-LF}{l}{it}{
+ <-> alias * SourceSansPro-LF/light/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{l}{sl}{
+ <-> alias * SourceSansPro-LF/light/sl
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{T1}{SourceSansPro-LF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-sc-t1
+ <-> alias * SourceSansPro-LF/regular/sc
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-t1
+ <-> alias * SourceSansPro-LF/regular/n
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-lf-t1
+ <-> alias * SourceSansPro-LF/regular/it
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{m}{sl}{
- <-> ssub * SourceSansPro-LF/m/it
+ <-> alias * SourceSansPro-LF/regular/sl
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{sc}{
+ <-> alias * SourceSansPro-LF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{n}{
+ <-> alias * SourceSansPro-LF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{it}{
+ <-> alias * SourceSansPro-LF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{sb}{sl}{
+ <-> alias * SourceSansPro-LF/semibold/sl
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{b}{sl}{
+ <-> alias * SourceSansPro-LF/bold/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-t1
+ <-> alias * SourceSansPro-LF/bold/it
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-t1
+ <-> alias * SourceSansPro-LF/bold/n
}{}
\DeclareFontShape{T1}{SourceSansPro-LF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-sc-t1
+ <-> alias * SourceSansPro-LF/bold/sc
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{b}{sl}{
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{eb}{it}{
+ <-> alias * SourceSansPro-LF/black/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{eb}{sl}{
+ <-> alias * SourceSansPro-LF/black/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{eb}{sc}{
+ <-> alias * SourceSansPro-LF/black/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{eb}{n}{
+ <-> alias * SourceSansPro-LF/black/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-LF}{bx}{it}{
<-> ssub * SourceSansPro-LF/b/it
}{}
@@ -111,16 +258,12 @@
<-> ssub * SourceSansPro-LF/b/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{bx}{n}{
- <-> ssub * SourceSansPro-LF/b/n
-}{}
-
\DeclareFontShape{T1}{SourceSansPro-LF}{bx}{sc}{
<-> ssub * SourceSansPro-LF/b/sc
}{}
-\DeclareFontShape{T1}{SourceSansPro-LF}{bx}{it}{
- <-> ssub * SourceSansPro-LF/b/it
+\DeclareFontShape{T1}{SourceSansPro-LF}{bx}{n}{
+ <-> ssub * SourceSansPro-LF/b/n
}{}
\endinput
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-Numr.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-Numr.fd
index 62dac77d99..07b51f4d6a 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-Numr.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-Numr.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-Numr.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-Numr.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-Numr.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,88 +19,199 @@
\DeclareFontFamily{T1}{SourceSansPro-Numr}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{k}{it}{
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{black}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BlackIt-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{k}{n}{
+\DeclareFontShape{T1}{SourceSansPro-Numr}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{k}{sl}{
- <-> ssub * SourceSansPro-Numr/k/it
+\DeclareFontShape{T1}{SourceSansPro-Numr}{black}{sl}{
+ <-> ssub * SourceSansPro-Numr/black/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-numr-t1
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-numr-t1
+\DeclareFontShape{T1}{SourceSansPro-Numr}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{l}{sl}{
- <-> ssub * SourceSansPro-Numr/l/it
+\DeclareFontShape{T1}{SourceSansPro-Numr}{bold}{sl}{
+ <-> ssub * SourceSansPro-Numr/bold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{sb}{n}{
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{semibold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{sb}{it}{
+\DeclareFontShape{T1}{SourceSansPro-Numr}{semibold}{it}{
<-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{sb}{sl}{
- <-> ssub * SourceSansPro-Numr/sb/it
+\DeclareFontShape{T1}{SourceSansPro-Numr}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Numr/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-numr-t1
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-numr-t1
+\DeclareFontShape{T1}{SourceSansPro-Numr}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{b}{sl}{
- <-> ssub * SourceSansPro-Numr/b/it
+\DeclareFontShape{T1}{SourceSansPro-Numr}{light}{sl}{
+ <-> ssub * SourceSansPro-Numr/light/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-numr-t1
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{m}{n}{
+\DeclareFontShape{T1}{SourceSansPro-Numr}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Numr/extralight/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{regular}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-numr-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{m}{sl}{
- <-> ssub * SourceSansPro-Numr/m/it
+\DeclareFontShape{T1}{SourceSansPro-Numr}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-numr-t1
}{}
+\DeclareFontShape{T1}{SourceSansPro-Numr}{regular}{sl}{
+ <-> ssub * SourceSansPro-Numr/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{T1}{SourceSansPro-Numr}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-numr-t1
+ <-> alias * SourceSansPro-Numr/extralight/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{el}{sl}{
+ <-> alias * SourceSansPro-Numr/extralight/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-Numr}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-numr-t1
+ <-> alias * SourceSansPro-Numr/extralight/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{el}{sl}{
- <-> ssub * SourceSansPro-Numr/el/it
+
+% l --> light
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{l}{sl}{
+ <-> alias * SourceSansPro-Numr/light/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{bx}{it}{
- <-> ssub * SourceSansPro-Numr/b/it
+\DeclareFontShape{T1}{SourceSansPro-Numr}{l}{it}{
+ <-> alias * SourceSansPro-Numr/light/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Numr}{bx}{n}{
- <-> ssub * SourceSansPro-Numr/b/n
+\DeclareFontShape{T1}{SourceSansPro-Numr}{l}{n}{
+ <-> alias * SourceSansPro-Numr/light/n
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{m}{n}{
+ <-> alias * SourceSansPro-Numr/regular/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{m}{sl}{
+ <-> alias * SourceSansPro-Numr/regular/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{m}{it}{
+ <-> alias * SourceSansPro-Numr/regular/it
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{sb}{it}{
+ <-> alias * SourceSansPro-Numr/semibold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{sb}{sl}{
+ <-> alias * SourceSansPro-Numr/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{sb}{n}{
+ <-> alias * SourceSansPro-Numr/semibold/n
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{b}{sl}{
+ <-> alias * SourceSansPro-Numr/bold/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{b}{it}{
+ <-> alias * SourceSansPro-Numr/bold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{b}{n}{
+ <-> alias * SourceSansPro-Numr/bold/n
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{eb}{n}{
+ <-> alias * SourceSansPro-Numr/black/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{eb}{it}{
+ <-> alias * SourceSansPro-Numr/black/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{eb}{sl}{
+ <-> alias * SourceSansPro-Numr/black/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Numr}{bx}{it}{
+ <-> ssub * SourceSansPro-Numr/b/it
}{}
\DeclareFontShape{T1}{SourceSansPro-Numr}{bx}{sl}{
<-> ssub * SourceSansPro-Numr/b/sl
}{}
+\DeclareFontShape{T1}{SourceSansPro-Numr}{bx}{n}{
+ <-> ssub * SourceSansPro-Numr/b/n
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-OsF.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-OsF.fd
index accd195849..12cb23aa70 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-OsF.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-OsF.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-OsF.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-OsF.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,100 +19,239 @@
\DeclareFontFamily{T1}{SourceSansPro-OsF}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-t1
-}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-osf-sc-t1
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-osf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-osf-t1
+\DeclareFontShape{T1}{SourceSansPro-OsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{k}{sl}{
- <-> ssub * SourceSansPro-OsF/k/it
+\DeclareFontShape{T1}{SourceSansPro-OsF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-osf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-OsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-OsF/regular/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{n}{
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-osf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{it}{
+\DeclareFontShape{T1}{SourceSansPro-OsF}{light}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{sl}{
- <-> ssub * SourceSansPro-OsF/l/it
+\DeclareFontShape{T1}{SourceSansPro-OsF}{light}{sl}{
+ <-> ssub * SourceSansPro-OsF/light/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-t1
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{sc}{
+\DeclareFontShape{T1}{SourceSansPro-OsF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-OsF/extralight/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{semibold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-t1
+\DeclareFontShape{T1}{SourceSansPro-OsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{sl}{
- <-> ssub * SourceSansPro-OsF/sb/it
+\DeclareFontShape{T1}{SourceSansPro-OsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-t1
+\DeclareFontShape{T1}{SourceSansPro-OsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-OsF/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-osf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{sc}{
+\DeclareFontShape{T1}{SourceSansPro-OsF}{bold}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-osf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{sl}{
- <-> ssub * SourceSansPro-OsF/b/it
+\DeclareFontShape{T1}{SourceSansPro-OsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-OsF/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-osf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-osf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-t1
}{}
+\DeclareFontShape{T1}{SourceSansPro-OsF}{black}{sl}{
+ <-> ssub * SourceSansPro-OsF/black/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{sc}{
+ <-> alias * SourceSansPro-OsF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{n}{
+ <-> alias * SourceSansPro-OsF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{it}{
+ <-> alias * SourceSansPro-OsF/extralight/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{sl}{
+ <-> alias * SourceSansPro-OsF/extralight/sl
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{sc}{
+ <-> alias * SourceSansPro-OsF/light/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{n}{
+ <-> alias * SourceSansPro-OsF/light/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{it}{
+ <-> alias * SourceSansPro-OsF/light/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{l}{sl}{
+ <-> alias * SourceSansPro-OsF/light/sl
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{T1}{SourceSansPro-OsF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-sc-t1
+ <-> alias * SourceSansPro-OsF/regular/sc
}{}
\DeclareFontShape{T1}{SourceSansPro-OsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-t1
+ <-> alias * SourceSansPro-OsF/regular/n
}{}
\DeclareFontShape{T1}{SourceSansPro-OsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-osf-t1
+ <-> alias * SourceSansPro-OsF/regular/it
}{}
\DeclareFontShape{T1}{SourceSansPro-OsF}{m}{sl}{
- <-> ssub * SourceSansPro-OsF/m/it
+ <-> alias * SourceSansPro-OsF/regular/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-t1
+
+% sb --> semibold
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{sl}{
+ <-> alias * SourceSansPro-OsF/semibold/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-t1
+\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{it}{
+ <-> alias * SourceSansPro-OsF/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{n}{
+ <-> alias * SourceSansPro-OsF/semibold/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{el}{sl}{
- <-> ssub * SourceSansPro-OsF/el/it
+\DeclareFontShape{T1}{SourceSansPro-OsF}{sb}{sc}{
+ <-> alias * SourceSansPro-OsF/semibold/sc
+}{}
+
+
+% b --> bold
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{n}{
+ <-> alias * SourceSansPro-OsF/bold/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{sc}{
+ <-> alias * SourceSansPro-OsF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{sl}{
+ <-> alias * SourceSansPro-OsF/bold/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{b}{it}{
+ <-> alias * SourceSansPro-OsF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{eb}{n}{
+ <-> alias * SourceSansPro-OsF/black/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{eb}{sc}{
+ <-> alias * SourceSansPro-OsF/black/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{eb}{sl}{
+ <-> alias * SourceSansPro-OsF/black/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{eb}{it}{
+ <-> alias * SourceSansPro-OsF/black/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-OsF}{bx}{sl}{
+ <-> ssub * SourceSansPro-OsF/b/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-OsF}{bx}{it}{
@@ -119,8 +266,4 @@
<-> ssub * SourceSansPro-OsF/b/sc
}{}
-\DeclareFontShape{T1}{SourceSansPro-OsF}{bx}{sl}{
- <-> ssub * SourceSansPro-OsF/b/sl
-}{}
-
\endinput
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-Sup.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-Sup.fd
index 2e023f8164..6c178a774d 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-Sup.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-Sup.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-Sup.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-Sup.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,80 +19,187 @@
\DeclareFontFamily{T1}{SourceSansPro-Sup}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-sup-t1
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-sup-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{m}{it}{
+\DeclareFontShape{T1}{SourceSansPro-Sup}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-sup-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{light}{sl}{
+ <-> ssub * SourceSansPro-Sup/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-sup-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-sup-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{extralight}{sl}{
+ <-> ssub * SourceSansPro-Sup/extralight/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-sup-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{semibold}{sl}{
+ <-> ssub * SourceSansPro-Sup/semibold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{regular}{it}{
<-> \SourceSansPro@@scale SourceSansPro-It-sup-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{m}{sl}{
- <-> ssub * SourceSansPro-Sup/m/it
+\DeclareFontShape{T1}{SourceSansPro-Sup}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-sup-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-sup-t1
+\DeclareFontShape{T1}{SourceSansPro-Sup}{regular}{sl}{
+ <-> ssub * SourceSansPro-Sup/regular/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{b}{n}{
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-sup-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-sup-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{black}{sl}{
+ <-> ssub * SourceSansPro-Sup/black/it
+}{}
+
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-sup-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{b}{sl}{
- <-> ssub * SourceSansPro-Sup/b/it
+\DeclareFontShape{T1}{SourceSansPro-Sup}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-sup-t1
}{}
+\DeclareFontShape{T1}{SourceSansPro-Sup}{bold}{sl}{
+ <-> ssub * SourceSansPro-Sup/bold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{T1}{SourceSansPro-Sup}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-sup-t1
+ <-> alias * SourceSansPro-Sup/extralight/n
}{}
\DeclareFontShape{T1}{SourceSansPro-Sup}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-sup-t1
+ <-> alias * SourceSansPro-Sup/extralight/it
}{}
\DeclareFontShape{T1}{SourceSansPro-Sup}{el}{sl}{
- <-> ssub * SourceSansPro-Sup/el/it
+ <-> alias * SourceSansPro-Sup/extralight/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-sup-t1
+
+% l --> light
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{l}{n}{
+ <-> alias * SourceSansPro-Sup/light/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-sup-t1
+\DeclareFontShape{T1}{SourceSansPro-Sup}{l}{it}{
+ <-> alias * SourceSansPro-Sup/light/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{l}{sl}{
+ <-> alias * SourceSansPro-Sup/light/sl
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{m}{n}{
+ <-> alias * SourceSansPro-Sup/regular/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{m}{sl}{
+ <-> alias * SourceSansPro-Sup/regular/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{m}{it}{
+ <-> alias * SourceSansPro-Sup/regular/it
}{}
+
+% sb --> semibold
+
\DeclareFontShape{T1}{SourceSansPro-Sup}{sb}{sl}{
- <-> ssub * SourceSansPro-Sup/sb/it
+ <-> alias * SourceSansPro-Sup/semibold/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-sup-t1
+\DeclareFontShape{T1}{SourceSansPro-Sup}{sb}{it}{
+ <-> alias * SourceSansPro-Sup/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-sup-t1
+\DeclareFontShape{T1}{SourceSansPro-Sup}{sb}{n}{
+ <-> alias * SourceSansPro-Sup/semibold/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{l}{sl}{
- <-> ssub * SourceSansPro-Sup/l/it
+
+% b --> bold
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{b}{n}{
+ <-> alias * SourceSansPro-Sup/bold/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-sup-t1
+\DeclareFontShape{T1}{SourceSansPro-Sup}{b}{it}{
+ <-> alias * SourceSansPro-Sup/bold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-sup-t1
+\DeclareFontShape{T1}{SourceSansPro-Sup}{b}{sl}{
+ <-> alias * SourceSansPro-Sup/bold/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{k}{sl}{
- <-> ssub * SourceSansPro-Sup/k/it
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{eb}{it}{
+ <-> alias * SourceSansPro-Sup/black/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-Sup}{bx}{it}{
- <-> ssub * SourceSansPro-Sup/b/it
+\DeclareFontShape{T1}{SourceSansPro-Sup}{eb}{sl}{
+ <-> alias * SourceSansPro-Sup/black/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-Sup}{eb}{n}{
+ <-> alias * SourceSansPro-Sup/black/n
}{}
\DeclareFontShape{T1}{SourceSansPro-Sup}{bx}{n}{
@@ -95,4 +210,8 @@
<-> ssub * SourceSansPro-Sup/b/sl
}{}
+\DeclareFontShape{T1}{SourceSansPro-Sup}{bx}{it}{
+ <-> ssub * SourceSansPro-Sup/b/it
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-TLF.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-TLF.fd
index 2f86912b4c..f2977ed164 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-TLF.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-TLF.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-TLF.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,100 +19,239 @@
\DeclareFontFamily{T1}{SourceSansPro-TLF}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-t1
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{sl}{
- <-> ssub * SourceSansPro-TLF/el/it
+\DeclareFontShape{T1}{SourceSansPro-TLF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TLF/bold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-t1
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{black}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{sl}{
- <-> ssub * SourceSansPro-TLF/b/it
+\DeclareFontShape{T1}{SourceSansPro-TLF}{black}{sl}{
+ <-> ssub * SourceSansPro-TLF/black/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{sc}{
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{regular}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{n}{
+\DeclareFontShape{T1}{SourceSansPro-TLF}{regular}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tlf-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TLF/regular/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{sl}{
- <-> ssub * SourceSansPro-TLF/m/it
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{k}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tlf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TLF/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{k}{sl}{
- <-> ssub * SourceSansPro-TLF/k/it
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-t1
+\DeclareFontShape{T1}{SourceSansPro-TLF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{l}{sc}{
+\DeclareFontShape{T1}{SourceSansPro-TLF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TLF/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{light}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tlf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{l}{it}{
+\DeclareFontShape{T1}{SourceSansPro-TLF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tlf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-tlf-t1
}{}
+\DeclareFontShape{T1}{SourceSansPro-TLF}{light}{sl}{
+ <-> ssub * SourceSansPro-TLF/light/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{n}{
+ <-> alias * SourceSansPro-TLF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{sc}{
+ <-> alias * SourceSansPro-TLF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{sl}{
+ <-> alias * SourceSansPro-TLF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{el}{it}{
+ <-> alias * SourceSansPro-TLF/extralight/it
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{l}{n}{
+ <-> alias * SourceSansPro-TLF/light/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{l}{sc}{
+ <-> alias * SourceSansPro-TLF/light/sc
+}{}
+
\DeclareFontShape{T1}{SourceSansPro-TLF}{l}{sl}{
- <-> ssub * SourceSansPro-TLF/l/it
+ <-> alias * SourceSansPro-TLF/light/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{l}{it}{
+ <-> alias * SourceSansPro-TLF/light/it
}{}
+
+% m --> regular
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{n}{
+ <-> alias * SourceSansPro-TLF/regular/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{sc}{
+ <-> alias * SourceSansPro-TLF/regular/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{sl}{
+ <-> alias * SourceSansPro-TLF/regular/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{m}{it}{
+ <-> alias * SourceSansPro-TLF/regular/it
+}{}
+
+
+% sb --> semibold
+
\DeclareFontShape{T1}{SourceSansPro-TLF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-t1
+ <-> alias * SourceSansPro-TLF/semibold/n
}{}
\DeclareFontShape{T1}{SourceSansPro-TLF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-sc-t1
+ <-> alias * SourceSansPro-TLF/semibold/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{sb}{sl}{
+ <-> alias * SourceSansPro-TLF/semibold/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-TLF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-t1
+ <-> alias * SourceSansPro-TLF/semibold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{sb}{sl}{
- <-> ssub * SourceSansPro-TLF/sb/it
+
+% b --> bold
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{sc}{
+ <-> alias * SourceSansPro-TLF/bold/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{n}{
+ <-> alias * SourceSansPro-TLF/bold/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{it}{
+ <-> alias * SourceSansPro-TLF/bold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{b}{sl}{
+ <-> alias * SourceSansPro-TLF/bold/sl
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{eb}{sl}{
+ <-> alias * SourceSansPro-TLF/black/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{eb}{it}{
+ <-> alias * SourceSansPro-TLF/black/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{eb}{n}{
+ <-> alias * SourceSansPro-TLF/black/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{eb}{sc}{
+ <-> alias * SourceSansPro-TLF/black/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TLF}{bx}{it}{
+ <-> ssub * SourceSansPro-TLF/b/it
}{}
\DeclareFontShape{T1}{SourceSansPro-TLF}{bx}{sl}{
@@ -119,8 +266,4 @@
<-> ssub * SourceSansPro-TLF/b/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-TLF}{bx}{it}{
- <-> ssub * SourceSansPro-TLF/b/it
-}{}
-
\endinput
diff --git a/fonts/sourcesanspro/tex/T1SourceSansPro-TOsF.fd b/fonts/sourcesanspro/tex/T1SourceSansPro-TOsF.fd
index 52b46fdd33..047badec69 100644
--- a/fonts/sourcesanspro/tex/T1SourceSansPro-TOsF.fd
+++ b/fonts/sourcesanspro/tex/T1SourceSansPro-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{T1SourceSansPro-TOsF.fd}
- [2016/12/03 (autoinst) Font definitions for T1/SourceSansPro-TOsF.]
+ [2020/01/19 (autoinst) Font definitions for T1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,116 +19,251 @@
\DeclareFontFamily{T1}{SourceSansPro-TOsF}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-t1
+
+% ---- bold ----
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-t1
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{bold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{sl}{
- <-> ssub * SourceSansPro-TOsF/sb/it
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/bold/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{k}{sc}{
+
+% ---- black ----
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{black}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tosf-sc-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{k}{n}{
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tosf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-t1
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{black}{sl}{
+ <-> ssub * SourceSansPro-TOsF/black/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{k}{sl}{
- <-> ssub * SourceSansPro-TOsF/k/it
+
+% ---- semibold ----
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-t1
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{l}{n}{
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{semibold}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/semibold/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{extralight}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TOsF/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tosf-t1
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{l}{sc}{
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{light}{sc}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tosf-sc-t1
}{}
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{light}{sl}{
+ <-> ssub * SourceSansPro-TOsF/light/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{regular}{sc}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-sc-t1
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TOsF/regular/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{n}{
+ <-> alias * SourceSansPro-TOsF/extralight/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{sc}{
+ <-> alias * SourceSansPro-TOsF/extralight/sc
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{sl}{
+ <-> alias * SourceSansPro-TOsF/extralight/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{it}{
+ <-> alias * SourceSansPro-TOsF/extralight/it
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{l}{it}{
+ <-> alias * SourceSansPro-TOsF/light/it
+}{}
+
\DeclareFontShape{T1}{SourceSansPro-TOsF}{l}{sl}{
- <-> ssub * SourceSansPro-TOsF/l/it
+ <-> alias * SourceSansPro-TOsF/light/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{l}{sc}{
+ <-> alias * SourceSansPro-TOsF/light/sc
}{}
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{l}{n}{
+ <-> alias * SourceSansPro-TOsF/light/n
+}{}
+
+
+% m --> regular
+
\DeclareFontShape{T1}{SourceSansPro-TOsF}{m}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-sc-t1
+ <-> alias * SourceSansPro-TOsF/regular/sc
}{}
\DeclareFontShape{T1}{SourceSansPro-TOsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-t1
+ <-> alias * SourceSansPro-TOsF/regular/n
}{}
\DeclareFontShape{T1}{SourceSansPro-TOsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tosf-t1
+ <-> alias * SourceSansPro-TOsF/regular/it
}{}
\DeclareFontShape{T1}{SourceSansPro-TOsF}{m}{sl}{
- <-> ssub * SourceSansPro-TOsF/m/it
+ <-> alias * SourceSansPro-TOsF/regular/sl
}{}
+
+% sb --> semibold
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{sl}{
+ <-> alias * SourceSansPro-TOsF/semibold/sl
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{it}{
+ <-> alias * SourceSansPro-TOsF/semibold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{n}{
+ <-> alias * SourceSansPro-TOsF/semibold/n
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{sb}{sc}{
+ <-> alias * SourceSansPro-TOsF/semibold/sc
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{T1}{SourceSansPro-TOsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-t1
+ <-> alias * SourceSansPro-TOsF/bold/it
+}{}
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{b}{sl}{
+ <-> alias * SourceSansPro-TOsF/bold/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-TOsF}{b}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-sc-t1
+ <-> alias * SourceSansPro-TOsF/bold/sc
}{}
\DeclareFontShape{T1}{SourceSansPro-TOsF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-t1
+ <-> alias * SourceSansPro-TOsF/bold/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{b}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/it
+
+% eb --> black
+
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{eb}{sc}{
+ <-> alias * SourceSansPro-TOsF/black/sc
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-t1
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{eb}{n}{
+ <-> alias * SourceSansPro-TOsF/black/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-t1
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{eb}{it}{
+ <-> alias * SourceSansPro-TOsF/black/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{sc}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-sc-t1
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{eb}{sl}{
+ <-> alias * SourceSansPro-TOsF/black/sl
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{el}{sl}{
- <-> ssub * SourceSansPro-TOsF/el/it
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{bx}{sl}{
+ <-> ssub * SourceSansPro-TOsF/b/sl
}{}
\DeclareFontShape{T1}{SourceSansPro-TOsF}{bx}{it}{
<-> ssub * SourceSansPro-TOsF/b/it
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{bx}{sc}{
- <-> ssub * SourceSansPro-TOsF/b/sc
-}{}
-
\DeclareFontShape{T1}{SourceSansPro-TOsF}{bx}{n}{
<-> ssub * SourceSansPro-TOsF/b/n
}{}
-\DeclareFontShape{T1}{SourceSansPro-TOsF}{bx}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/sl
+\DeclareFontShape{T1}{SourceSansPro-TOsF}{bx}{sc}{
+ <-> ssub * SourceSansPro-TOsF/b/sc
}{}
\endinput
diff --git a/fonts/sourcesanspro/tex/TS1SourceSansPro-LF.fd b/fonts/sourcesanspro/tex/TS1SourceSansPro-LF.fd
index d76b3a75a3..1368fad4a5 100644
--- a/fonts/sourcesanspro/tex/TS1SourceSansPro-LF.fd
+++ b/fonts/sourcesanspro/tex/TS1SourceSansPro-LF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{TS1SourceSansPro-LF.fd}
- [2016/12/03 (autoinst) Font definitions for TS1/SourceSansPro-LF.]
+ [2020/01/19 (autoinst) Font definitions for TS1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,88 +19,199 @@
\DeclareFontFamily{TS1}{SourceSansPro-LF}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-ts1
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-LF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{sb}{sl}{
- <-> ssub * SourceSansPro-LF/sb/it
+\DeclareFontShape{TS1}{SourceSansPro-LF}{bold}{sl}{
+ <-> ssub * SourceSansPro-LF/bold/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{k}{it}{
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{black}{it}{
<-> \SourceSansPro@@scale SourceSansPro-BlackIt-lf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{k}{n}{
+\DeclareFontShape{TS1}{SourceSansPro-LF}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-lf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{k}{sl}{
- <-> ssub * SourceSansPro-LF/k/it
+\DeclareFontShape{TS1}{SourceSansPro-LF}{black}{sl}{
+ <-> ssub * SourceSansPro-LF/black/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-lf-ts1
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{l}{it}{
+\DeclareFontShape{TS1}{SourceSansPro-LF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{regular}{sl}{
+ <-> ssub * SourceSansPro-LF/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-LF/semibold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-lf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{l}{sl}{
- <-> ssub * SourceSansPro-LF/l/it
+\DeclareFontShape{TS1}{SourceSansPro-LF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-lf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{el}{n}{
+\DeclareFontShape{TS1}{SourceSansPro-LF}{light}{sl}{
+ <-> ssub * SourceSansPro-LF/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-lf-ts1
}{}
+\DeclareFontShape{TS1}{SourceSansPro-LF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-LF/extralight/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{el}{n}{
+ <-> alias * SourceSansPro-LF/extralight/n
+}{}
+
\DeclareFontShape{TS1}{SourceSansPro-LF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-lf-ts1
+ <-> alias * SourceSansPro-LF/extralight/it
}{}
\DeclareFontShape{TS1}{SourceSansPro-LF}{el}{sl}{
- <-> ssub * SourceSansPro-LF/el/it
+ <-> alias * SourceSansPro-LF/extralight/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-lf-ts1
+
+% l --> light
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{l}{it}{
+ <-> alias * SourceSansPro-LF/light/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-lf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-LF}{l}{sl}{
+ <-> alias * SourceSansPro-LF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{l}{n}{
+ <-> alias * SourceSansPro-LF/light/n
}{}
+
+% m --> regular
+
\DeclareFontShape{TS1}{SourceSansPro-LF}{m}{sl}{
- <-> ssub * SourceSansPro-LF/m/it
+ <-> alias * SourceSansPro-LF/regular/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-lf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-LF}{m}{it}{
+ <-> alias * SourceSansPro-LF/regular/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{m}{n}{
+ <-> alias * SourceSansPro-LF/regular/n
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{sb}{n}{
+ <-> alias * SourceSansPro-LF/semibold/n
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{sb}{sl}{
+ <-> alias * SourceSansPro-LF/semibold/sl
}{}
+\DeclareFontShape{TS1}{SourceSansPro-LF}{sb}{it}{
+ <-> alias * SourceSansPro-LF/semibold/it
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{TS1}{SourceSansPro-LF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-lf-ts1
+ <-> alias * SourceSansPro-LF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{b}{it}{
+ <-> alias * SourceSansPro-LF/bold/it
}{}
\DeclareFontShape{TS1}{SourceSansPro-LF}{b}{sl}{
- <-> ssub * SourceSansPro-LF/b/it
+ <-> alias * SourceSansPro-LF/bold/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{bx}{sl}{
- <-> ssub * SourceSansPro-LF/b/sl
+
+% eb --> black
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{eb}{n}{
+ <-> alias * SourceSansPro-LF/black/n
}{}
-\DeclareFontShape{TS1}{SourceSansPro-LF}{bx}{it}{
- <-> ssub * SourceSansPro-LF/b/it
+\DeclareFontShape{TS1}{SourceSansPro-LF}{eb}{it}{
+ <-> alias * SourceSansPro-LF/black/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{eb}{sl}{
+ <-> alias * SourceSansPro-LF/black/sl
}{}
\DeclareFontShape{TS1}{SourceSansPro-LF}{bx}{n}{
<-> ssub * SourceSansPro-LF/b/n
}{}
+\DeclareFontShape{TS1}{SourceSansPro-LF}{bx}{it}{
+ <-> ssub * SourceSansPro-LF/b/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-LF}{bx}{sl}{
+ <-> ssub * SourceSansPro-LF/b/sl
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/TS1SourceSansPro-OsF.fd b/fonts/sourcesanspro/tex/TS1SourceSansPro-OsF.fd
index 9b7eb23501..cde0a8c94e 100644
--- a/fonts/sourcesanspro/tex/TS1SourceSansPro-OsF.fd
+++ b/fonts/sourcesanspro/tex/TS1SourceSansPro-OsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{TS1SourceSansPro-OsF.fd}
- [2016/12/03 (autoinst) Font definitions for TS1/SourceSansPro-OsF.]
+ [2020/01/19 (autoinst) Font definitions for TS1/SourceSansPro-OsF.]
+
+\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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,75 +19,190 @@
\DeclareFontFamily{TS1}{SourceSansPro-OsF}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-ts1
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-osf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{sb}{sl}{
- <-> ssub * SourceSansPro-OsF/sb/it
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{black}{sl}{
+ <-> ssub * SourceSansPro-OsF/black/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-osf-ts1
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-osf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-osf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{k}{sl}{
- <-> ssub * SourceSansPro-OsF/k/it
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-OsF/bold/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-ts1
+
+% ---- extralight ----
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{extralight}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{l}{n}{
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-OsF/extralight/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-osf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{l}{sl}{
- <-> ssub * SourceSansPro-OsF/l/it
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{light}{sl}{
+ <-> ssub * SourceSansPro-OsF/light/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-OsF/semibold/it
+}{}
+
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-osf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-OsF/regular/it
}{}
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{TS1}{SourceSansPro-OsF}{el}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLight-osf-ts1
+ <-> alias * SourceSansPro-OsF/extralight/n
}{}
\DeclareFontShape{TS1}{SourceSansPro-OsF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-osf-ts1
+ <-> alias * SourceSansPro-OsF/extralight/it
}{}
\DeclareFontShape{TS1}{SourceSansPro-OsF}{el}{sl}{
- <-> ssub * SourceSansPro-OsF/el/it
+ <-> alias * SourceSansPro-OsF/extralight/sl
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{l}{n}{
+ <-> alias * SourceSansPro-OsF/light/n
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{l}{it}{
+ <-> alias * SourceSansPro-OsF/light/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{l}{sl}{
+ <-> alias * SourceSansPro-OsF/light/sl
+}{}
+
+
+% m --> regular
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{m}{sl}{
+ <-> alias * SourceSansPro-OsF/regular/sl
}{}
\DeclareFontShape{TS1}{SourceSansPro-OsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-osf-ts1
+ <-> alias * SourceSansPro-OsF/regular/it
}{}
\DeclareFontShape{TS1}{SourceSansPro-OsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-osf-ts1
+ <-> alias * SourceSansPro-OsF/regular/n
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{m}{sl}{
- <-> ssub * SourceSansPro-OsF/m/it
+
+% sb --> semibold
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{sb}{n}{
+ <-> alias * SourceSansPro-OsF/semibold/n
}{}
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{sb}{it}{
+ <-> alias * SourceSansPro-OsF/semibold/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{sb}{sl}{
+ <-> alias * SourceSansPro-OsF/semibold/sl
+}{}
+
+
+% b --> bold
+
\DeclareFontShape{TS1}{SourceSansPro-OsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-osf-ts1
+ <-> alias * SourceSansPro-OsF/bold/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{b}{sl}{
+ <-> alias * SourceSansPro-OsF/bold/sl
}{}
\DeclareFontShape{TS1}{SourceSansPro-OsF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-osf-ts1
+ <-> alias * SourceSansPro-OsF/bold/n
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{b}{sl}{
+
+% eb --> black
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{eb}{n}{
+ <-> alias * SourceSansPro-OsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{eb}{sl}{
+ <-> alias * SourceSansPro-OsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{eb}{it}{
+ <-> alias * SourceSansPro-OsF/black/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-OsF}{bx}{it}{
<-> ssub * SourceSansPro-OsF/b/it
}{}
@@ -91,8 +214,4 @@
<-> ssub * SourceSansPro-OsF/b/n
}{}
-\DeclareFontShape{TS1}{SourceSansPro-OsF}{bx}{it}{
- <-> ssub * SourceSansPro-OsF/b/it
-}{}
-
\endinput
diff --git a/fonts/sourcesanspro/tex/TS1SourceSansPro-TLF.fd b/fonts/sourcesanspro/tex/TS1SourceSansPro-TLF.fd
index db72c55d88..453a2e3546 100644
--- a/fonts/sourcesanspro/tex/TS1SourceSansPro-TLF.fd
+++ b/fonts/sourcesanspro/tex/TS1SourceSansPro-TLF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{TS1SourceSansPro-TLF.fd}
- [2016/12/03 (autoinst) Font definitions for TS1/SourceSansPro-TLF.]
+ [2020/01/19 (autoinst) Font definitions for TS1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,86 +19,197 @@
\DeclareFontFamily{TS1}{SourceSansPro-TLF}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-ts1
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{bold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{sb}{sl}{
- <-> ssub * SourceSansPro-TLF/sb/it
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TLF/bold/it
+}{}
+
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{k}{n}{
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{black}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Black-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tlf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{black}{sl}{
+ <-> ssub * SourceSansPro-TLF/black/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{k}{sl}{
- <-> ssub * SourceSansPro-TLF/k/it
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{l}{n}{
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TLF/regular/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{light}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Light-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{l}{it}{
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{light}{it}{
<-> \SourceSansPro@@scale SourceSansPro-LightIt-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{l}{sl}{
- <-> ssub * SourceSansPro-TLF/l/it
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{light}{sl}{
+ <-> ssub * SourceSansPro-TLF/light/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{el}{n}{
+
+% ---- extralight ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{extralight}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tlf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{el}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tlf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TLF/extralight/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tlf-ts1
}{}
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tlf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TLF/semibold/it
+}{}
+
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
\DeclareFontShape{TS1}{SourceSansPro-TLF}{el}{sl}{
- <-> ssub * SourceSansPro-TLF/el/it
+ <-> alias * SourceSansPro-TLF/extralight/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tlf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{el}{it}{
+ <-> alias * SourceSansPro-TLF/extralight/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tlf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{el}{n}{
+ <-> alias * SourceSansPro-TLF/extralight/n
+}{}
+
+
+% l --> light
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{l}{it}{
+ <-> alias * SourceSansPro-TLF/light/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{l}{sl}{
+ <-> alias * SourceSansPro-TLF/light/sl
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{l}{n}{
+ <-> alias * SourceSansPro-TLF/light/n
}{}
+
+% m --> regular
+
\DeclareFontShape{TS1}{SourceSansPro-TLF}{m}{sl}{
- <-> ssub * SourceSansPro-TLF/m/it
+ <-> alias * SourceSansPro-TLF/regular/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tlf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{m}{it}{
+ <-> alias * SourceSansPro-TLF/regular/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{m}{n}{
+ <-> alias * SourceSansPro-TLF/regular/n
+}{}
+
+
+% sb --> semibold
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{sb}{it}{
+ <-> alias * SourceSansPro-TLF/semibold/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{sb}{sl}{
+ <-> alias * SourceSansPro-TLF/semibold/sl
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{sb}{n}{
+ <-> alias * SourceSansPro-TLF/semibold/n
}{}
+
+% b --> bold
+
\DeclareFontShape{TS1}{SourceSansPro-TLF}{b}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Bold-tlf-ts1
+ <-> alias * SourceSansPro-TLF/bold/n
}{}
\DeclareFontShape{TS1}{SourceSansPro-TLF}{b}{sl}{
- <-> ssub * SourceSansPro-TLF/b/it
+ <-> alias * SourceSansPro-TLF/bold/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TLF}{bx}{sl}{
- <-> ssub * SourceSansPro-TLF/b/sl
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{b}{it}{
+ <-> alias * SourceSansPro-TLF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{eb}{it}{
+ <-> alias * SourceSansPro-TLF/black/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{eb}{sl}{
+ <-> alias * SourceSansPro-TLF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{eb}{n}{
+ <-> alias * SourceSansPro-TLF/black/n
}{}
\DeclareFontShape{TS1}{SourceSansPro-TLF}{bx}{n}{
<-> ssub * SourceSansPro-TLF/b/n
}{}
+\DeclareFontShape{TS1}{SourceSansPro-TLF}{bx}{sl}{
+ <-> ssub * SourceSansPro-TLF/b/sl
+}{}
+
\DeclareFontShape{TS1}{SourceSansPro-TLF}{bx}{it}{
<-> ssub * SourceSansPro-TLF/b/it
}{}
diff --git a/fonts/sourcesanspro/tex/TS1SourceSansPro-TOsF.fd b/fonts/sourcesanspro/tex/TS1SourceSansPro-TOsF.fd
index 40ec03ef55..0a768981e9 100644
--- a/fonts/sourcesanspro/tex/TS1SourceSansPro-TOsF.fd
+++ b/fonts/sourcesanspro/tex/TS1SourceSansPro-TOsF.fd
@@ -1,7 +1,15 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\ProvidesFile{TS1SourceSansPro-TOsF.fd}
- [2016/12/03 (autoinst) Font definitions for TS1/SourceSansPro-TOsF.]
+ [2020/01/19 (autoinst) Font definitions for TS1/SourceSansPro-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 SourceSansPro@scale\endcsname\relax
\let\SourceSansPro@@scale\@empty
@@ -11,80 +19,187 @@
\DeclareFontFamily{TS1}{SourceSansPro-TOsF}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{el}{it}{
+
+% ---- regular ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{regular}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-It-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{regular}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{regular}{sl}{
+ <-> ssub * SourceSansPro-TOsF/regular/it
+}{}
+
+
+% ---- semibold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{semibold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{semibold}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{semibold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/semibold/it
+}{}
+
+
+% ---- light ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{light}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{light}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{light}{sl}{
+ <-> ssub * SourceSansPro-TOsF/light/it
+}{}
+
+
+% ---- extralight ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{extralight}{it}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLightIt-tosf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{el}{n}{
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{extralight}{n}{
<-> \SourceSansPro@@scale SourceSansPro-ExtraLight-tosf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{el}{sl}{
- <-> ssub * SourceSansPro-TOsF/el/it
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{extralight}{sl}{
+ <-> ssub * SourceSansPro-TOsF/extralight/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{b}{n}{
+
+% ---- bold ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{bold}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-ts1
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{bold}{n}{
<-> \SourceSansPro@@scale SourceSansPro-Bold-tosf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{b}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BoldIt-tosf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{bold}{sl}{
+ <-> ssub * SourceSansPro-TOsF/bold/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{b}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/it
+
+% ---- black ----
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{black}{n}{
+ <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{m}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-It-tosf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{black}{it}{
+ <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-ts1
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{m}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Regular-tosf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{black}{sl}{
+ <-> ssub * SourceSansPro-TOsF/black/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{m}{sl}{
- <-> ssub * SourceSansPro-TOsF/m/it
+%
+% Extra 'alias' rules to map the standard NFSS codes to our fancy names
+%
+
+% el --> extralight
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{el}{n}{
+ <-> alias * SourceSansPro-TOsF/extralight/n
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{k}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-BlackIt-tosf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{el}{sl}{
+ <-> alias * SourceSansPro-TOsF/extralight/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{k}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Black-tosf-ts1
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{el}{it}{
+ <-> alias * SourceSansPro-TOsF/extralight/it
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{k}{sl}{
- <-> ssub * SourceSansPro-TOsF/k/it
+
+% l --> light
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{l}{sl}{
+ <-> alias * SourceSansPro-TOsF/light/sl
}{}
\DeclareFontShape{TS1}{SourceSansPro-TOsF}{l}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-LightIt-tosf-ts1
+ <-> alias * SourceSansPro-TOsF/light/it
}{}
\DeclareFontShape{TS1}{SourceSansPro-TOsF}{l}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Light-tosf-ts1
+ <-> alias * SourceSansPro-TOsF/light/n
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{l}{sl}{
- <-> ssub * SourceSansPro-TOsF/l/it
+
+% m --> regular
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{m}{n}{
+ <-> alias * SourceSansPro-TOsF/regular/n
}{}
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{m}{it}{
+ <-> alias * SourceSansPro-TOsF/regular/it
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{m}{sl}{
+ <-> alias * SourceSansPro-TOsF/regular/sl
+}{}
+
+
+% sb --> semibold
+
\DeclareFontShape{TS1}{SourceSansPro-TOsF}{sb}{n}{
- <-> \SourceSansPro@@scale SourceSansPro-Semibold-tosf-ts1
+ <-> alias * SourceSansPro-TOsF/semibold/n
}{}
\DeclareFontShape{TS1}{SourceSansPro-TOsF}{sb}{it}{
- <-> \SourceSansPro@@scale SourceSansPro-SemiboldIt-tosf-ts1
+ <-> alias * SourceSansPro-TOsF/semibold/it
}{}
\DeclareFontShape{TS1}{SourceSansPro-TOsF}{sb}{sl}{
- <-> ssub * SourceSansPro-TOsF/sb/it
+ <-> alias * SourceSansPro-TOsF/semibold/sl
}{}
-\DeclareFontShape{TS1}{SourceSansPro-TOsF}{bx}{sl}{
- <-> ssub * SourceSansPro-TOsF/b/sl
+
+% b --> bold
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{b}{n}{
+ <-> alias * SourceSansPro-TOsF/bold/n
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{b}{sl}{
+ <-> alias * SourceSansPro-TOsF/bold/sl
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{b}{it}{
+ <-> alias * SourceSansPro-TOsF/bold/it
+}{}
+
+
+% eb --> black
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{eb}{n}{
+ <-> alias * SourceSansPro-TOsF/black/n
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{eb}{sl}{
+ <-> alias * SourceSansPro-TOsF/black/sl
+}{}
+
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{eb}{it}{
+ <-> alias * SourceSansPro-TOsF/black/it
}{}
\DeclareFontShape{TS1}{SourceSansPro-TOsF}{bx}{n}{
@@ -95,4 +210,8 @@
<-> ssub * SourceSansPro-TOsF/b/it
}{}
+\DeclareFontShape{TS1}{SourceSansPro-TOsF}{bx}{sl}{
+ <-> ssub * SourceSansPro-TOsF/b/sl
+}{}
+
\endinput
diff --git a/fonts/sourcesanspro/tex/sourcesanspro-type1-autoinst.sty b/fonts/sourcesanspro/tex/sourcesanspro-type1-autoinst.sty
index 60372ec8cc..f29e01bfa5 100644
--- a/fonts/sourcesanspro/tex/sourcesanspro-type1-autoinst.sty
+++ b/fonts/sourcesanspro/tex/sourcesanspro-type1-autoinst.sty
@@ -1,8 +1,8 @@
-%% Generated by autoinst on 2016/12/03
+%% Generated by autoinst on 2020/01/19
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{SourceSansPro}
- [2016/12/03 (autoinst) Style file for SourceSansPro.]
+ [2020/01/19 (autoinst) Style file for SourceSansPro.]
\RequirePackage[T1,LY1,LGR]{fontenc}
\RequirePackage{textcomp}
@@ -46,17 +46,18 @@
\DeclareOptionX{oldstyle}{\edef\SourceSansPro@figurestyle{OsF}}
\DeclareOptionX{tabular}{\edef\SourceSansPro@figurealign{T}}
\DeclareOptionX{proportional}{\edef\SourceSansPro@figurealign{}}
-\DeclareOptionX{black}{\edef\bfseries@sf{k}}
-\DeclareOptionX{semibold}{\edef\bfseries@sf{sb}}
-\DeclareOptionX{bold}{\edef\bfseries@sf{b}}
-\DeclareOptionX{light}{\edef\mdseries@sf{l}}
-\DeclareOptionX{regular}{\edef\mdseries@sf{m}}
+\DeclareOptionX{mainfont}{
+ \renewcommand{\familydefault}{\sfdefault}
+}
+\DeclareOptionX{black}{\edef\bfseries@sf{black}}
+\DeclareOptionX{semibold}{\edef\bfseries@sf{semibold}}
+\DeclareOptionX{bold}{\edef\bfseries@sf{bold}}
+\DeclareOptionX{regular}{\edef\mdseries@sf{regular}}
\ExecuteOptionsX{oldstyle,proportional,bold,regular}
\ProcessOptionsX\relax
\renewcommand*
{\sfdefault}
{SourceSansPro-\SourceSansPro@figurealign\SourceSansPro@figurestyle}
-\renewcommand*{\familydefault}{\sfdefault}
\endinput
diff --git a/fonts/sourcesanspro/tex/sourcesanspro.sty b/fonts/sourcesanspro/tex/sourcesanspro.sty
index 7f448313af..5b5900a7e2 100644
--- a/fonts/sourcesanspro/tex/sourcesanspro.sty
+++ b/fonts/sourcesanspro/tex/sourcesanspro.sty
@@ -8,7 +8,7 @@
% Licenced under the LPPL v1.3 or higher.
%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{sourcesanspro}[2016/12/03 v2.6 Adobe's Source Sans Pro typeface]
+\ProvidesPackage{sourcesanspro}[2018/05/19 v2.7 Adobe's Source Sans Pro typeface]
\RequirePackage{ifxetex,ifluatex,xkeyval}
@@ -59,7 +59,7 @@
\DeclareOptionX{otf} {\sourcesanspro@otftrue}
% Default options
-\ExecuteOptionsX{sfdefault,lining,proportional,bold,regular}
+\ExecuteOptionsX{sfdefault,lining,tabular,bold,regular}
\ProcessOptionsX\relax
% Load OpenType files
@@ -78,7 +78,7 @@
% Tabular/Proportional
\ifsourcesanspro@tabular
- \def\sourcesanspro@figurealign{Monospaced}
+ \def\sourcesanspro@figurealign{}
\else
\def\sourcesanspro@figurealign{Proportional}
\fi
@@ -180,7 +180,7 @@
% Black/Semibold/Bold
\ifsourcesanspro@black
- \def\bfseries@sf{k}
+ \def\bfseries@sf{eb}
\else
\ifsourcesanspro@semibold
\def\bfseries@sf{sb}